Merge pull request android#373 from googlesamples/clang-update

Use clang to build teapot samples
kecson · Mar 30, 2017 · becff48 · becff48
2 parents 6fd4907 + d4eca62
commit becff48
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/teapots/choreographer-30fps/build.gradle b/teapots/choreographer-30fps/build.gradle
@@ -6,7 +6,7 @@ apply plugin: 'com.android.application'
 
      defaultConfig {
          applicationId 'com.sample.choreographer'
-         minSdkVersion 16
+         minSdkVersion 21
          targetSdkVersion 25
          ndk {
              abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'arm64-v8a'

diff --git a/teapots/more-teapots/build.gradle b/teapots/more-teapots/build.gradle
@@ -7,15 +7,15 @@ android {
 
     defaultConfig {
         applicationId  'com.sample.moreteapots'
-        minSdkVersion   17
+        minSdkVersion   21
         targetSdkVersion 25
         ndk {
             abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a','x86'
         }
         externalNativeBuild {
             cmake {
-                arguments '-DANDROID_PLATFORM=android-22',
-                    '-DANDROID_TOOLCHAIN=gcc', '-DANDROID_STL=c++_static'
+                arguments '-DANDROID_PLATFORM=android-21',
+                    '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_static'
             }
         }
     }