Merge pull request android#343 from googlesamples/ndkhelper-consolida…

…tion Consolidating ndk_helper source code
kecson · Dec 27, 2016 · 64f940a · 64f940a
2 parents 8ed0536 + d05cb61
commit 64f940a
Show file tree

Hide file tree

Showing 45 changed files with 1,742 additions and 5,747 deletions.
diff --git a/teapots/build.gradle b/teapots/build.gradle
@@ -4,7 +4,7 @@ buildscript {
        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.0-beta1'
     }
 }
 

diff --git a/teapots/choreographer-30fps/build.gradle b/teapots/choreographer-30fps/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
  android {
      compileSdkVersion 23
-     buildToolsVersion '23.0.2'
+     buildToolsVersion '25.0.0'
 
      defaultConfig {
          applicationId 'com.sample.choreographer'

diff --git a/teapots/choreographer-30fps/src/main/cpp/CMakeLists.txt b/teapots/choreographer-30fps/src/main/cpp/CMakeLists.txt
@@ -23,7 +23,8 @@ add_library(app-glue STATIC
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -Wall -fno-exceptions -fno-rtti")
 
 # build the ndk-helper library
-add_subdirectory(ndk_helper)
+set(ndk_helper_dir ../../../../common/ndk_helper)
+add_subdirectory(${ndk_helper_dir} ndk_helper)
 
 # now build app's shared lib
 add_library(ChoreographerNativeActivity SHARED
@@ -33,7 +34,7 @@ add_library(ChoreographerNativeActivity SHARED
 target_include_directories(ChoreographerNativeActivity PRIVATE
                            ${ANDROID_NDK}/sources/android/cpufeatures
                            ${ANDROID_NDK}/sources/android/native_app_glue
-                           ndk_helper)
+                           ${ndk_helper_dir})
 
 # add lib dependencies
 target_link_libraries(ChoreographerNativeActivity

diff --git a/teapots/choreographer-30fps/src/main/cpp/ndk_helper/CMakeLists.txt b/teapots/choreographer-30fps/src/main/cpp/ndk_helper/CMakeLists.txt
diff --git a/teapots/choreographer-30fps/src/main/cpp/ndk_helper/GLContext.cpp b/teapots/choreographer-30fps/src/main/cpp/ndk_helper/GLContext.cpp