Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: jni/Android.mk

Issue 6606493159784448: New JNI bindings (Closed)
Patch Set: Reuploaded full diff Created March 28, 2014, 3:56 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | jni/JniCallbacks.h » ('j') | jni/JniCallbacks.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 := abpEngine 26 LOCAL_MODULE := abpEngine
Felix Dahlke 2014/03/28 17:36:23 Me being pedantic, but I don't think "abpEngine" m
René Jeschke 2014/03/31 09:10:38 I think we should just call it 'libadblockplus' as
Felix Dahlke 2014/03/31 10:43:23 Trouble is, we actually have a module called "liba
René Jeschke 2014/04/11 12:25:53 Done.
27 LOCAL_SRC_FILES := AbpEngine.cpp Utils.cpp AndroidLogSystem.cpp AndroidWebReques t.cpp 27 LOCAL_SRC_FILES := AbpEngine.cpp Utils.cpp AndroidLogSystem.cpp AndroidWebReques t.cpp
28 LOCAL_SRC_FILES += JniJsEngine.cpp JniFilterEngine.cpp JniJsValue.cpp JniFilter. cpp
29 LOCAL_SRC_FILES += JniSubscription.cpp JniEventCallback.cpp JniLogSystem.cpp
30 LOCAL_SRC_FILES += JniWebRequest.cpp JniUpdaterCallback.cpp JniFilterChangeCallb ack.cpp
31 LOCAL_SRC_FILES += JniCallbacks.cpp
28 32
29 LOCAL_CPP_FEATURES := rtti exceptions 33 LOCAL_CPP_FEATURES := rtti exceptions
30 LOCAL_CFLAGS += -std=gnu++0x 34 LOCAL_CFLAGS += -std=gnu++0x
31 35
32 LOCAL_C_INCLUDES := jni/libadblockplus-binaries/include/ 36 LOCAL_C_INCLUDES := jni/libadblockplus-binaries/include/
33 LOCAL_STATIC_LIBRARIES := libadblockplus v8-base v8-snapshot 37 LOCAL_STATIC_LIBRARIES := libadblockplus v8-base v8-snapshot
34 LOCAL_LDLIBS := -llog 38 LOCAL_LDLIBS := -llog
35 39
36 include $(BUILD_SHARED_LIBRARY) 40 include $(BUILD_SHARED_LIBRARY)
OLDNEW
« no previous file with comments | « no previous file | jni/JniCallbacks.h » ('j') | jni/JniCallbacks.h » ('J')

Powered by Google App Engine
This is Rietveld