Side by Side Diff: jni/Android.mk
Issue 11172036:
ABP/Android libadblockplus integration (Closed)
Patch Set:
Created July 22, 2013, 8:52 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« .project ('k')
|
jni/AndroidLogSystem.h » ('j')
|
jni/AndroidWebRequest.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 LOCAL_PATH := $(call my-dir) | 1 LOCAL_PATH := $(call my-dir) |
| 2 | 2 |
| 3 include $(CLEAR_VARS) | 3 include $(CLEAR_VARS) |
| 4 | 4 |
| 5 LOCAL_MODULE := libadblockplus | |
| 6 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_arm/libadblockplus. a | |
| 7 | |
| 8 include $(PREBUILT_STATIC_LIBRARY) | |
| 9 | |
| 10 include $(CLEAR_VARS) | |
| 11 | |
| 5 LOCAL_MODULE := v8-base | 12 LOCAL_MODULE := v8-base |
| 6 LOCAL_SRC_FILES»» := ./v8/libv8_base.a | 13 LOCAL_SRC_FILES»» := ./libadblockplus-binaries/android_arm/libv8_base.a |
| 7 | 14 |
| 8 include $(PREBUILT_STATIC_LIBRARY) | 15 include $(PREBUILT_STATIC_LIBRARY) |
| 9 | 16 |
| 10 include $(CLEAR_VARS) | 17 include $(CLEAR_VARS) |
| 11 | 18 |
| 12 LOCAL_MODULE := v8-snapshot | 19 LOCAL_MODULE := v8-snapshot |
| 13 LOCAL_SRC_FILES»» := ./v8/libv8_nosnapshot.a | 20 LOCAL_SRC_FILES»» := ./libadblockplus-binaries/android_arm/libv8_snapshot. a |
| 14 | 21 |
| 15 include $(PREBUILT_STATIC_LIBRARY) | 22 include $(PREBUILT_STATIC_LIBRARY) |
| 16 | 23 |
| 17 include $(CLEAR_VARS) | 24 include $(CLEAR_VARS) |
| 18 | 25 |
| 19 LOCAL_MODULE » := v8-preparser | 26 LOCAL_MODULE » := abpEngine |
| 20 LOCAL_SRC_FILES»» := ./v8/libpreparser_lib.a | 27 LOCAL_SRC_FILES » := abpEngine.cpp Utils.cpp AndroidLogSystem.cpp AndroidW ebRequest.cpp |
| 21 | 28 |
| 22 include $(PREBUILT_STATIC_LIBRARY) | 29 LOCAL_CPP_FEATURES » := rtti #exceptions |
|
Felix Dahlke
2013/09/13 14:40:39
Why is exceptions commented out? We're using excep
| |
| 23 | |
| 24 include $(CLEAR_VARS) | |
| 25 | |
| 26 LOCAL_MODULE » := jsEngine | |
| 27 LOCAL_SRC_FILES » := jsEngine.cpp wrap.cpp fileOps.cpp timerOps.cpp utilit yOps.cpp xhrOps.cpp | |
| 28 | |
| 29 LOCAL_CPP_FEATURES » := #rtti #exceptions | |
| 30 LOCAL_CFLAGS += \ | 30 LOCAL_CFLAGS += \ |
|
Felix Dahlke
2013/09/13 14:40:39
Do we really need all these flags? I'm thinking -s
| |
| 31 -std=gnu++0x \ | |
| 31 -Wno-endif-labels \ | 32 -Wno-endif-labels \ |
| 32 -Wno-import \ | 33 -Wno-import \ |
| 33 -Wno-format \ | 34 -Wno-format \ |
| 34 -fno-exceptions \ | 35 -fno-exceptions \ |
| 35 -DENABLE_DEBUGGER_SUPPORT \ | 36 -DENABLE_DEBUGGER_SUPPORT \ |
| 36 -DV8_NATIVE_REGEXP \ | |
| 37 -fvisibility=hidden \ | 37 -fvisibility=hidden \ |
| 38 -DARM \ | 38 -DARM \ |
| 39 -DV8_TARGET_ARCH_ARM \ | |
| 40 -DENABLE_LOGGING_AND_PROFILING | 39 -DENABLE_LOGGING_AND_PROFILING |
|
Wladimir Palant
2013/09/12 11:31:14
This definition and ENABLE_DEBUGGER_SUPPORT are al
| |
| 41 | 40 |
| 42 LOCAL_C_INCLUDES » » := jni/v8/ | 41 LOCAL_C_INCLUDES » » := jni/libadblockplus-binaries/include/ |
| 43 LOCAL_STATIC_LIBRARIES» := v8-base v8-snapshot | 42 LOCAL_STATIC_LIBRARIES» := libadblockplus v8-base v8-snapshot |
| 44 LOCAL_LDLIBS := -llog | 43 LOCAL_LDLIBS := -llog |
| 45 | 44 |
| 46 include $(BUILD_SHARED_LIBRARY) | 45 include $(BUILD_SHARED_LIBRARY) |
| 47 | |
| 48 | |
| OLD | NEW |
« no previous file with comments
|
« .project ('k')
|
jni/AndroidLogSystem.h » ('j')
|
jni/AndroidWebRequest.h » ('J')
