Skip to content

Commit 0aff431

Browse files
Andrew HsiehGerrit Code Review
authored andcommitted
Merge "Addressed feedbacks - Now they are in ndkHelper:: name space - Changed module name to ndk_helper - Changed some static members to class var or stand alone function - Added syncronization for JNIHelper.cpp - For a documentation, I will work with doc writer for future improvement"
2 parents 4abacac + 13754d5 commit 0aff431

Some content is hidden

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

46 files changed

+5611
-4673
lines changed

ndk/platforms/android-17/samples/Teapot/jni/Android.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ LOCAL_C_INCLUDES :=
1111
LOCAL_CFLAGS :=
1212

1313
LOCAL_LDLIBS := -llog -landroid -lEGL -lGLESv2
14-
LOCAL_STATIC_LIBRARIES := cpufeatures android_native_app_glue helper
14+
LOCAL_STATIC_LIBRARIES := cpufeatures android_native_app_glue ndk_helper
1515

1616
include $(BUILD_SHARED_LIBRARY)
1717

18-
$(call import-module,android/helper)
18+
$(call import-module,android/ndk_helper)
1919
$(call import-module,android/native_app_glue)
2020
$(call import-module,android/cpufeatures)

0 commit comments

Comments
 (0)