Side by Side Diff: jni/Android.mk
Issue 5697499218051072:
Usage of new API, cleanups (reduced) (Closed)
Patch Set:
Created April 11, 2014, 1:31 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« jni/AbpEngine.cpp ('k')
|
jni/AndroidLogSystem.h » ('j')
|
jni/Application.mk » ('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 | 5 LOCAL_MODULE := libadblockplus |
| 6 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_arm/libadblockplus.a | 6 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_arm/libadblockplus.a |
| 7 | 7 |
| 8 include $(PREBUILT_STATIC_LIBRARY) | 8 include $(PREBUILT_STATIC_LIBRARY) |
| 9 | 9 |
| 10 include $(CLEAR_VARS) | 10 include $(CLEAR_VARS) |
| 11 | 11 |
| 12 LOCAL_MODULE := v8-base | 12 LOCAL_MODULE := v8-base |
| 13 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_arm/libv8_base.a | 13 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_arm/libv8_base.a |
| 14 | 14 |
| 15 include $(PREBUILT_STATIC_LIBRARY) | 15 include $(PREBUILT_STATIC_LIBRARY) |
| 16 | 16 |
| 17 include $(CLEAR_VARS) | 17 include $(CLEAR_VARS) |
| 18 | 18 |
| 19 LOCAL_MODULE := v8-snapshot | 19 LOCAL_MODULE := v8-snapshot |
| 20 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_arm/libv8_snapshot.a | 20 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_arm/libv8_snapshot.a |
| 21 | 21 |
| 22 include $(PREBUILT_STATIC_LIBRARY) | 22 include $(PREBUILT_STATIC_LIBRARY) |
| 23 | 23 |
| 24 include $(CLEAR_VARS) | 24 include $(CLEAR_VARS) |
| 25 | 25 |
| 26 LOCAL_MODULE := libadblockplus-jni | 26 LOCAL_MODULE := libadblockplus-jni |
| 27 LOCAL_SRC_FILES := AbpEngine.cpp Utils.cpp AndroidLogSystem.cpp AndroidWebReques t.cpp | 27 LOCAL_SRC_FILES := JniJsEngine.cpp JniFilterEngine.cpp JniJsValue.cpp JniFilter. cpp |
| 28 LOCAL_SRC_FILES += JniJsEngine.cpp JniFilterEngine.cpp JniJsValue.cpp JniFilter. cpp | |
| 29 LOCAL_SRC_FILES += JniSubscription.cpp JniEventCallback.cpp JniLogSystem.cpp | 28 LOCAL_SRC_FILES += JniSubscription.cpp JniEventCallback.cpp JniLogSystem.cpp |
| 30 LOCAL_SRC_FILES += JniWebRequest.cpp JniUpdaterCallback.cpp JniFilterChangeCallb ack.cpp | 29 LOCAL_SRC_FILES += JniWebRequest.cpp JniUpdaterCallback.cpp JniFilterChangeCallb ack.cpp |
| 31 LOCAL_SRC_FILES += JniCallbacks.cpp | 30 LOCAL_SRC_FILES += JniCallbacks.cpp Utils.cpp |
| 32 | 31 |
| 33 LOCAL_CPP_FEATURES := rtti exceptions | 32 LOCAL_CPP_FEATURES := exceptions # rtti |
|
Felix Dahlke
2014/04/16 15:24:25
I assume we don't need RTTI anymore? Might as well
René Jeschke
2014/04/16 17:51:47
Done.
| |
| 34 LOCAL_CFLAGS += -std=gnu++0x | 33 LOCAL_CFLAGS += -std=gnu++0x |
| 35 | 34 |
| 36 LOCAL_C_INCLUDES := jni/libadblockplus-binaries/include/ | 35 LOCAL_C_INCLUDES := jni/libadblockplus-binaries/include/ |
| 37 LOCAL_STATIC_LIBRARIES := libadblockplus v8-base v8-snapshot | 36 LOCAL_STATIC_LIBRARIES := libadblockplus v8-base v8-snapshot |
| 38 LOCAL_LDLIBS := -llog | |
| 39 | 37 |
| 40 include $(BUILD_SHARED_LIBRARY) | 38 include $(BUILD_SHARED_LIBRARY) |
| OLD | NEW |
« no previous file with comments
|
« jni/AbpEngine.cpp ('k')
|
jni/AndroidLogSystem.h » ('j')
|
jni/Application.mk » ('J')
