Skip to content

Commit dc9972b

Browse files
ggfanggfan
committed
1. Add 64bit support for UI layer:
 add a cache in between native and JNI to make 64 bit pointersafe when native passes UI pointer to JNI, an ID is assigned for the UI pointer, and ID is passed to JNI/JAVA side; when JAVA notifies native side for user event, JAVA pass back the given ID to native, native do an immediate lookup to get back the UI object pointer, and our life begins from here normally as before 2. Refactor shared code directory created a Common directory to parallel with sample project directory modify sample project's Android.mk under jni to use code under Common. Change-Id: Ie459674fa52b58561b52bbfbb98b78d4ea168421
1 parent ad9e602 commit dc9972b

File tree

209 files changed

+160
-26735
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

209 files changed

+160
-26735
lines changed

‎samples-android/ButtonClicker/jni/Android.mk‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ LOCAL_SRC_FILES := ButtonClickerNativeActivity.cpp \
77
ButtonClickerNativeActivity_Engine.cpp \
88
TeapotRenderer.cpp
99

10-
LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. $(LOCAL_PATH)/ndk_helper/ $(LOCAL_PATH)/jui_helper/ $(LOCAL_PATH)/external/jsoncpp/include/
1110
LOCAL_CFLAGS :=
1211
LOCAL_CPPFLAGS := -std=c++11
1312

@@ -28,8 +27,7 @@ endif
2827

2928
include $(BUILD_SHARED_LIBRARY)
3029

31-
$(call import-add-path,$(LOCAL_PATH)/../../..)
32-
$(call import-add-path,$(LOCAL_PATH))
30+
$(call import-add-path,$(LOCAL_PATH)/../../Common)
3331
$(call import-module,ndk_helper)
3432
$(call import-module,jui_helper)
3533
$(call import-module,gpg-cpp-sdk/android)

0 commit comments

Comments
 (0)