Skip to content

Commit f4b89cb

Browse files
ggfanggfan
authored
Merge pull request #283 from googlesamples/cmake-update-2-2-beta2
Update builds and use productFlavours for cmake branch
2 parents c5ba8e0 + 1cae952 commit f4b89cb

File tree

60 files changed

+210
-148
lines changed

Some content is hidden

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

60 files changed

+210
-148
lines changed

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
local.properties
55
build
66
*~
7-
.DS_Store
87
externalNativeBuild
98
.externalNativeBuild
109
libwebp

‎MoreTeapots/app/build.gradle

+10-7
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,29 @@ android {
99
applicationId 'com.sample.moreteapots'
1010
minSdkVersion 17
1111
targetSdkVersion 22
12+
ndkConfig.abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a','x86'
1213
externalNativeBuild {
1314
cmake {
14-
abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'arm64-v8a'
15+
arguments '-DANDROID_PLATFORM=android-22',
16+
'-DANDROID_TOOLCHAIN=gcc', '-DANDROID_STL=c++_static'
1517
}
1618
}
1719
}
1820
buildTypes {
1921
release {
2022
minifyEnabled = false
21-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
23+
proguardFiles getDefaultProguardFile('proguard-android.txt'),
24+
'proguard-rules.pro'
2225
}
2326
}
2427
externalNativeBuild {
2528
cmake {
2629
path 'src/main/cpp/CMakeLists.txt'
2730
}
2831
}
29-
dependencies {
30-
compile fileTree(dir: 'libs', include: ['*.jar'])
31-
compile 'com.android.support:appcompat-v7:23.4.0'
32-
compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha2'
33-
}
32+
}
33+
dependencies {
34+
compile fileTree(dir: 'libs', include: ['*.jar'])
35+
compile 'com.android.support:appcompat-v7:23.4.0'
36+
compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha7'
3437
}

‎MoreTeapots/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
jcenter()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:2.2.0-alpha5'
7+
classpath 'com.android.tools.build:gradle:2.2.0-beta2'
88
}
99
}
1010

‎MoreTeapots/gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Apr 10 15:27:10 PDT 2013
1+
#Mon Aug 22 14:56:47 PDT 2016
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

‎Teapot/app/build.gradle

+6-3
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,19 @@ android {
88
applicationId = 'com.sample.teapot'
99
minSdkVersion 17
1010
targetSdkVersion 22
11+
ndkConfig.abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a','x86', 'x86_64'
1112
externalNativeBuild {
1213
cmake {
13-
abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'arm64-v8a'
14+
arguments '-DANDROID_PLATFORM=android-17',
15+
'-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=gnustl_static'
1416
}
1517
}
1618
}
1719
buildTypes {
1820
release {
1921
minifyEnabled = false
20-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
22+
proguardFiles getDefaultProguardFile('proguard-android.txt'),
23+
'proguard-rules.pro'
2124
}
2225
}
2326
externalNativeBuild {
@@ -30,5 +33,5 @@ android {
3033
dependencies {
3134
compile fileTree(dir: 'libs', include: ['*.jar'])
3235
compile 'com.android.support:appcompat-v7:23.4.0'
33-
compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha2'
36+
compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha7'
3437
}

‎Teapot/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
jcenter()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:2.2.0-alpha5'
7+
classpath 'com.android.tools.build:gradle:2.2.0-beta2'
88
}
99
}
1010

‎Teapot/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip

‎audio-echo/app/build.gradle

+6-3
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,19 @@ android {
1010
targetSdkVersion 23
1111
versionCode 1
1212
versionName '1.0'
13+
ndkConfig.abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
1314
externalNativeBuild {
1415
cmake {
15-
abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'arm64-v8a'
16+
arguments '-DANDROID_STL=gnustl_static', '-DANDROID_TOOLCHAIN=gcc',
17+
'-DABDRIOID_PLATFORM=21'
1618
}
1719
}
1820
}
1921
buildTypes {
2022
release {
21-
minifyEnabled=false
22-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
23+
minifyEnabled false
24+
proguardFiles getDefaultProguardFile('proguard-android.txt'),
25+
'proguard-rules.pro'
2326
}
2427
}
2528
externalNativeBuild {

‎audio-echo/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.2.0-alpha5'
8+
classpath 'com.android.tools.build:gradle:2.2.0-beta2'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

‎audio-echo/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip

‎bitmap-plasma/app/build.gradle

+9-4
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,22 @@ android {
88
applicationId 'com.example.plasma'
99
minSdkVersion 8
1010
targetSdkVersion 23
11+
ndkConfig.abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86'
12+
externalNativeBuild {
13+
cmake {
14+
arguments '-DANDROID_PLATFORM=android-8', '-DANDROID_TOOLCHAIN=clang'
15+
}
16+
}
1117
}
1218
buildTypes {
1319
release {
14-
minifyEnabled = false
15-
proguardFiles.add(file('proguard-rules.txt'))
20+
minifyEnabled false
21+
proguardFiles getDefaultProguardFile('proguard-android.txt'),
22+
'proguard-rules.pro'
1623
}
1724
}
1825
externalNativeBuild {
1926
cmake {
20-
// platformVersion = 9
21-
// toolchain = clang
2227
path 'src/main/cpp/CMakeLists.txt'
2328
}
2429
}

‎bitmap-plasma/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
jcenter()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:2.2.0-alpha5'
7+
classpath 'com.android.tools.build:gradle:2.2.0-beta2'
88
}
99
}
1010

‎bitmap-plasma/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip

‎builder/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip

‎choreographer-30fps/app/build.gradle

+6-4
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,22 @@ apply plugin: 'com.android.application'
88
applicationId 'com.sample.choreographer'
99
minSdkVersion 16
1010
targetSdkVersion 22
11+
ndkConfig.abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'arm64-v8a'
1112
externalNativeBuild {
1213
cmake {
13-
abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'arm64-v8a'
14+
arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=gnustl_static',
15+
'-DANDROID_PLATFORM=android-21'
1416
}
1517
}
1618
}
1719
buildTypes {
1820
release {
1921
minifyEnabled = false
20-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
22+
proguardFiles getDefaultProguardFile('proguard-android.txt'),
23+
'proguard-rules.pro'
2124
}
2225
}
2326
externalNativeBuild {
24-
// this one needs platformVersion = 21
2527
cmake {
2628
path 'src/main/cpp/CMakeLists.txt'
2729
}
@@ -31,5 +33,5 @@ apply plugin: 'com.android.application'
3133
dependencies {
3234
compile fileTree(dir: 'libs', include: ['*.jar'])
3335
compile 'com.android.support:appcompat-v7:23.4.0'
34-
compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha2'
36+
compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha7'
3537
}

‎choreographer-30fps/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
jcenter()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:2.2.0-alpha5'
7+
classpath 'com.android.tools.build:gradle:2.2.0-beta2'
88
}
99
}
1010

‎choreographer-30fps/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip

‎endless-tunnel/app/build.gradle

+6-10
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,19 @@ android {
2626
targetSdkVersion 23
2727
versionCode 1
2828
versionName '1.0'
29+
ndkConfig.abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'arm64-v8a'
2930
externalNativeBuild {
3031
cmake {
31-
abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'arm64-v8a'
32+
arguments '-DANDROID_PLATFORM=android-9',
33+
'-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=gnustl_static'
3234
}
3335
}
3436
}
35-
/*
36-
ndk {
37-
platformVersion = 9
38-
toolchain = 'clang'
39-
stl = 'gnustl_static' // recommending gnustl_static/gnustl_shared for android
40-
}
41-
*/
4237
buildTypes {
4338
release {
4439
minifyEnabled = false
45-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
40+
proguardFiles getDefaultProguardFile('proguard-android.txt'),
41+
'proguard-rules.pro'
4642
}
4743
}
4844
externalNativeBuild {
@@ -57,5 +53,5 @@ android.lintOptions {
5753
dependencies {
5854
compile fileTree(dir: 'libs', include: ['*.jar'])
5955
compile 'com.android.support:appcompat-v7:23.4.0'
60-
compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha1'
56+
compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha7'
6157
}

‎endless-tunnel/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
jcenter()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:2.2.0-alpha5'
7+
classpath 'com.android.tools.build:gradle:2.2.0-beta2'
88
}
99
}
1010

‎endless-tunnel/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip

‎gles3jni/app/build.gradle

+6-4
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,22 @@ android {
1111
applicationId 'com.android.gles3jni'
1212
minSdkVersion 18
1313
targetSdkVersion 23
14+
ndkConfig.abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'arm64-v8a'
1415
externalNativeBuild {
1516
cmake {
1617
// pass command line arguments to cmake: our CMakeLists.txt needs it
1718
// to load the right openGL lib (gles2 vs. gles3 )
18-
// other ndk flags could also be configured here [cppFlags, cFlags...]
19-
arguments "-DTARGET_PLATFORM_VERSION=${platformVersion}"
20-
abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'arm64-v8a'
19+
// other ndk flags could also be configured there [cppFlags, cFlags...]
20+
arguments "-DANDROID_PLATFORM=android-${platformVersion}",
21+
'-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=gnustl_static'
2122
}
2223
}
2324
}
2425
buildTypes {
2526
release {
2627
minifyEnabled = false
27-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
28+
proguardFiles getDefaultProguardFile('proguard-android.txt'),
29+
'proguard-rules.pro'
2830
}
2931
}
3032
externalNativeBuild {

‎gles3jni/app/src/main/cpp/CMakeLists.txt

+4-3
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,16 @@ set(gles3jni_SRCS gles3jni.cpp
1515
RendererES3.cpp
1616
gl3stub.c.inc
1717
RendererES2.cpp)
18-
if (${TARGET_PLATFORM_VERSION} LESS 11)
18+
19+
if (${ANDROID_PLATFORM_LEVEL} LESS 11)
1920
MESSAGE(ERROR " OpenGL 2 is not supported")
2021
return()
21-
elseif (${TARGET_PLATFORM_VERSION} LESS 18)
22+
elseif (${ANDROID_PLATFORM_LEVEL} LESS 18)
2223
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDYNAMIC_ES3")
2324
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDYNAMIC_ES3")
2425
set(gles3jni_SRCS ${gles3jni_SRCS} gl3stub_wrapper.c)
2526
set(OPENGL_LIB GLESv2)
26-
endif (${TARGET_PLATFORM_VERSION} LESS 11)
27+
endif (${ANDROID_PLATFORM_LEVEL} LESS 11)
2728

2829
add_library(gles3jni SHARED ${gles3jni_SRCS})
2930

‎gles3jni/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
jcenter()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:2.2.0-alpha5'
7+
classpath 'com.android.tools.build:gradle:2.2.0-beta2'
88
}
99
}
1010

‎gles3jni/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip

‎hello-gl2/app/build.gradle

+7-9
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,21 @@ android {
77
applicationId 'com.android.gl2jni'
88
minSdkVersion 5
99
targetSdkVersion 23
10+
ndkConfig.abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'arm64-v8a'
1011
externalNativeBuild {
1112
cmake {
12-
abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'arm64-v8a'
13+
// Available argumetns are inside ${SDK}/cmake/.../android.toolchain.cmake file
14+
arguments '-DANDROID_PLATFORM=android-9',
15+
'-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=gnustl_static'
1316
}
1417
}
1518
}
16-
/*
17-
ndk {
18-
platformVersion = 9
19-
toolchain = 'clang'
20-
stl = 'gnustl_static'
21-
}
22-
*/
19+
2320
buildTypes {
2421
release {
2522
minifyEnabled = false
26-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
23+
proguardFiles getDefaultProguardFile('proguard-android.txt'),
24+
'proguard-rules.pro'
2725
}
2826
}
2927
externalNativeBuild {

‎hello-gl2/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
jcenter()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:2.2.0-alpha5'
7+
classpath 'com.android.tools.build:gradle:2.2.0-beta2'
88
}
99
}
1010

‎hello-gl2/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip

0 commit comments

Comments
 (0)