jni/Android.mk - Issue 5697499218051072: Usage of new API, cleanups (reduced)

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Delta Between Two Patch Sets: jni/Android.mk

Issue 5697499218051072: Usage of new API, cleanups (reduced) (Closed)

Left Patch Set: Created April 11, 2014, 1:31 p.m.

Right Patch Set: Even more review issues fixed. Created April 28, 2014, 10:18 a.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Left: Side by side diff | Download
Right: Side by side diff | Download

LEFT	RIGHT
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)

(...skipping 11 matching lines...) Expand all Loading...
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 := JniJsEngine.cpp JniFilterEngine.cpp JniJsValue.cpp JniFilter. cpp	27 LOCAL_SRC_FILES := JniJsEngine.cpp JniFilterEngine.cpp JniJsValue.cpp JniFilter. cpp

28 LOCAL_SRC_FILES += JniSubscription.cpp JniEventCallback.cpp JniLogSystem.cpp	28 LOCAL_SRC_FILES += JniSubscription.cpp JniEventCallback.cpp JniLogSystem.cpp

29 LOCAL_SRC_FILES += JniWebRequest.cpp JniUpdaterCallback.cpp JniFilterChangeCallb ack.cpp	29 LOCAL_SRC_FILES += JniWebRequest.cpp JniUpdaterCallback.cpp JniFilterChangeCallb ack.cpp

30 LOCAL_SRC_FILES += JniCallbacks.cpp Utils.cpp	30 LOCAL_SRC_FILES += JniCallbacks.cpp Utils.cpp

31	31

32 LOCAL_CPP_FEATURES := exceptions # rtti	32 LOCAL_CPP_FEATURES := exceptions
Felix Dahlke 2014/04/16 15:24:25 I assume we don't need RTTI anymore? Might as well I assume we don't need RTTI anymore? Might as well get rid of the comment. René Jeschke 2014/04/16 17:51:47 Done. Show quoted text On 2014/04/16 15:24:25, Felix H. Dahlke wrote: > I assume we don't need RTTI anymore? Might as well get rid of the comment. Done.
33 LOCAL_CFLAGS += -std=gnu++0x	33 LOCAL_CFLAGS += -std=gnu++0x

34	34

35 LOCAL_C_INCLUDES := jni/libadblockplus-binaries/include/	35 LOCAL_C_INCLUDES := jni/libadblockplus-binaries/include/

36 LOCAL_STATIC_LIBRARIES := libadblockplus v8-base v8-snapshot	36 LOCAL_STATIC_LIBRARIES := libadblockplus v8-base v8-snapshot

37	37

38 include $(BUILD_SHARED_LIBRARY)	38 include $(BUILD_SHARED_LIBRARY)

LEFT	RIGHT