Unified Diff: jni/Android.mk
Issue 11172036:
ABP/Android libadblockplus integration (Closed)
Patch Set:
Created July 22, 2013, 8:52 a.m.
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')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: jni/Android.mk |
| =================================================================== |
| --- a/jni/Android.mk |
| +++ b/jni/Android.mk |
| @@ -2,47 +2,44 @@ |
| include $(CLEAR_VARS) |
| +LOCAL_MODULE := libadblockplus |
| +LOCAL_SRC_FILES := ./libadblockplus-binaries/android_arm/libadblockplus.a |
| + |
| +include $(PREBUILT_STATIC_LIBRARY) |
| + |
| +include $(CLEAR_VARS) |
| + |
| LOCAL_MODULE := v8-base |
| -LOCAL_SRC_FILES := ./v8/libv8_base.a |
| +LOCAL_SRC_FILES := ./libadblockplus-binaries/android_arm/libv8_base.a |
| include $(PREBUILT_STATIC_LIBRARY) |
| include $(CLEAR_VARS) |
| LOCAL_MODULE := v8-snapshot |
| -LOCAL_SRC_FILES := ./v8/libv8_nosnapshot.a |
| +LOCAL_SRC_FILES := ./libadblockplus-binaries/android_arm/libv8_snapshot.a |
| include $(PREBUILT_STATIC_LIBRARY) |
| include $(CLEAR_VARS) |
| -LOCAL_MODULE := v8-preparser |
| -LOCAL_SRC_FILES := ./v8/libpreparser_lib.a |
| +LOCAL_MODULE := abpEngine |
| +LOCAL_SRC_FILES := abpEngine.cpp Utils.cpp AndroidLogSystem.cpp AndroidWebRequest.cpp |
| -include $(PREBUILT_STATIC_LIBRARY) |
| - |
| -include $(CLEAR_VARS) |
| - |
| -LOCAL_MODULE := jsEngine |
| -LOCAL_SRC_FILES := jsEngine.cpp wrap.cpp fileOps.cpp timerOps.cpp utilityOps.cpp xhrOps.cpp |
| - |
| -LOCAL_CPP_FEATURES := #rtti #exceptions |
| +LOCAL_CPP_FEATURES := rtti #exceptions |
|
Felix Dahlke
2013/09/13 14:40:39
Why is exceptions commented out? We're using excep
|
| LOCAL_CFLAGS += \ |
|
Felix Dahlke
2013/09/13 14:40:39
Do we really need all these flags? I'm thinking -s
|
| + -std=gnu++0x \ |
| -Wno-endif-labels \ |
| -Wno-import \ |
| -Wno-format \ |
| -fno-exceptions \ |
| -DENABLE_DEBUGGER_SUPPORT \ |
| - -DV8_NATIVE_REGEXP \ |
| -fvisibility=hidden \ |
| -DARM \ |
| - -DV8_TARGET_ARCH_ARM \ |
| -DENABLE_LOGGING_AND_PROFILING |
|
Wladimir Palant
2013/09/12 11:31:14
This definition and ENABLE_DEBUGGER_SUPPORT are al
|
| -LOCAL_C_INCLUDES := jni/v8/ |
| -LOCAL_STATIC_LIBRARIES := v8-base v8-snapshot |
| +LOCAL_C_INCLUDES := jni/libadblockplus-binaries/include/ |
| +LOCAL_STATIC_LIBRARIES := libadblockplus v8-base v8-snapshot |
| LOCAL_LDLIBS := -llog |
| include $(BUILD_SHARED_LIBRARY) |
| - |
| - |
« no previous file with comments
|
« .project ('k')
|
jni/AndroidLogSystem.h » ('j')
|
jni/AndroidWebRequest.h » ('J')
