android/ndk-samples
1
0
Fork 0
mirror of https://github.com/android/ndk-samples synced 2025-11-12 12:11:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

addressing doubl quotation issue from CI:

Browse Source 
update all to single quotation whenever applicable except for
  hello-thirdparty ( dealing with it when working on it)
This commit is contained in:
guanghuafan
2016-04-18 11:48:48 -07:00
parent 03f9b3d02f
commit 60d5b73144
11 changed files with 90 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
MoreTeapots/app/build.gradle
View File

@@ -14,39 +14,39 @@ if (propertiesFile.exists()) {
model { model {
android { android {
compileSdkVersion = 23 compileSdkVersion = 23
buildToolsVersion = "23.0.2" buildToolsVersion = '23.0.2'
defaultConfig { defaultConfig {
applicationId = "com.sample.moreteapots" applicationId = 'com.sample.moreteapots'
minSdkVersion.apiLevel = 17 minSdkVersion.apiLevel = 17
targetSdkVersion.apiLevel = 22 targetSdkVersion.apiLevel = 22
} }
ndk { ndk {
moduleName = "MoreTeapotsNativeActivity" moduleName = 'MoreTeapotsNativeActivity'
// temporarily use gcc since clang does not work on windows (*) // temporarily use gcc since clang does not work on windows (*)
// also clang warning about inline, so could not use -Wall, -Werror // also clang warning about inline, so could not use -Wall, -Werror
// toolchain = "clang" // toolchain = "clang"
stl = "gnustl_static" stl = 'gnustl_static'
cppFlags.addAll(["-I" + "${ndkDir}/sources/android/cpufeatures", cppFlags.addAll(['-I' + "${ndkDir}/sources/android/cpufeatures",
"-I" + file("src/main/jni/ndk_helper")]) '-I' + file('src/main/jni/ndk_helper')])
cppFlags.addAll(["-std=c++11", "-Werror", "-Wall", cppFlags.addAll(['-std=c++11', '-Werror', '-Wall',
"-fno-exceptions", "-fno-rtti"]) '-fno-exceptions', '-fno-rtti'])
ldLibs.addAll(["android", "log", "EGL", "GLESv2","atomic"]) ldLibs.addAll(['android', 'log', 'EGL', 'GLESv2','atomic'])
} }
// Turn on hard float support in armeabi-v7a // Turn on hard float support in armeabi-v7a
abis { abis {
create("armeabi-v7a") { create('armeabi-v7a') {
cppFlags.addAll(["-mhard-float", "-D_NDK_MATH_NO_SOFTFP=1", cppFlags.addAll(['-mhard-float', '-D_NDK_MATH_NO_SOFTFP=1',
"-mfloat-abi=hard"]) '-mfloat-abi=hard'])
ldLibs.add("m_hard") ldLibs.add('m_hard')
ldFlags.add("-Wl,--no-warn-mismatch") ldFlags.add('-Wl,--no-warn-mismatch')
} }
} }
sources { sources {
main { main {
jni { jni {
dependencies { dependencies {
project ":nativeactivity" linkage "static" project ':nativeactivity' linkage 'static'
} }
source { source {
srcDirs 'src/main/jni' srcDirs 'src/main/jni'

10
MoreTeapots/nativeactivity/build.gradle
View File

@@ -11,17 +11,17 @@ if (propertiesFile.exists()) {
model { model {
android { android {
compileSdkVersion = 23 compileSdkVersion = 23
buildToolsVersion = "23.0.2" buildToolsVersion = '23.0.2'
defaultConfig.with { defaultConfig.with {
minSdkVersion.apiLevel = 9 minSdkVersion.apiLevel = 9
targetSdkVersion.apiLevel = 23 targetSdkVersion.apiLevel = 23
versionCode = 1 versionCode = 1
versionName = "0.0.1" versionName = '0.0.1'
} }
ndk { ndk {
moduleName = "native-activity" moduleName = 'native-activity'
ldLibs.addAll(["log", "android"]) ldLibs.addAll(['log', 'android'])
ldFlags.add("-c") ldFlags.add('-c')
} }
sources { sources {
main { main {

30
Teapot/app/build.gradle
View File

@@ -14,39 +14,39 @@ if (propertiesFile.exists()) {
model { model {
android { android {
compileSdkVersion = 23 compileSdkVersion = 23
buildToolsVersion = "23.0.2" buildToolsVersion = '23.0.2'
defaultConfig { defaultConfig {
applicationId = "com.sample.teapot" applicationId = 'com.sample.teapot'
minSdkVersion.apiLevel = 17 minSdkVersion.apiLevel = 17
targetSdkVersion.apiLevel = 22 targetSdkVersion.apiLevel = 22
} }
ndk { ndk {
moduleName = "TeapotNativeActivity" moduleName = 'TeapotNativeActivity'
// temporarily use gcc since clang does not work on windows (*) // temporarily use gcc since clang does not work on windows (*)
// also clang warning about inline, so could not use -Wall, -Werror // also clang warning about inline, so could not use -Wall, -Werror
// toolchain = "clang" // toolchain = "clang"
stl = "gnustl_static" stl = 'gnustl_static'
cppFlags.addAll(["-I" + "${ndkDir}/sources/android/cpufeatures", cppFlags.addAll(['-I' + "${ndkDir}/sources/android/cpufeatures",
"-I" + file("src/main/jni/ndk_helper")]) '-I' + file('src/main/jni/ndk_helper')])
cppFlags.addAll(["-std=c++11", "-Werror", "-Wall", cppFlags.addAll(['-std=c++11', '-Werror', '-Wall',
"-fno-exceptions", "-fno-rtti"]) '-fno-exceptions', '-fno-rtti'])
ldLibs.addAll(["android", "log", "EGL", "GLESv2","atomic"]) ldLibs.addAll(['android', 'log', 'EGL', 'GLESv2','atomic'])
} }
// Turn on hard float support in armeabi-v7a // Turn on hard float support in armeabi-v7a
abis { abis {
create("armeabi-v7a") { create('armeabi-v7a') {
cppFlags.addAll(["-mhard-float", "-D_NDK_MATH_NO_SOFTFP=1", cppFlags.addAll(['-mhard-float', '-D_NDK_MATH_NO_SOFTFP=1',
"-mfloat-abi=hard"]) '-mfloat-abi=hard'])
ldLibs.add("m_hard") ldLibs.add('m_hard')
ldFlags.add("-Wl,--no-warn-mismatch") ldFlags.add('-Wl,--no-warn-mismatch')
} }
} }
sources { sources {
main { main {
jni { jni {
dependencies { dependencies {
project ":nativeactivity" linkage "static" project ':nativeactivity' linkage 'static'
} }
source { source {
srcDirs 'src/main/jni' srcDirs 'src/main/jni'

10
Teapot/nativeactivity/build.gradle
View File

@@ -11,17 +11,17 @@ if (propertiesFile.exists()) {
model { model {
android { android {
compileSdkVersion = 23 compileSdkVersion = 23
buildToolsVersion = "23.0.2" buildToolsVersion = '23.0.2'
defaultConfig.with { defaultConfig.with {
minSdkVersion.apiLevel = 9 minSdkVersion.apiLevel = 9
targetSdkVersion.apiLevel = 23 targetSdkVersion.apiLevel = 23
versionCode = 1 versionCode = 1
versionName = "0.0.1" versionName = '0.0.1'
} }
ndk { ndk {
moduleName = "native-activity" moduleName = 'native-activity'
ldLibs.addAll(["log", "android"]) ldLibs.addAll(['log', 'android'])
ldFlags.add("-c") ldFlags.add('-c')
} }
sources { sources {
main { main {

12
audio-echo/app/build.gradle
View File

@@ -3,20 +3,20 @@ apply plugin: 'com.android.model.application'
model { model {
android { android {
compileSdkVersion = 23 compileSdkVersion = 23
buildToolsVersion = "23.0.2" buildToolsVersion = '23.0.2'
defaultConfig { defaultConfig {
applicationId="com.google.sample.echo" applicationId='com.google.sample.echo'
minSdkVersion.apiLevel = 17 minSdkVersion.apiLevel = 17
targetSdkVersion.apiLevel = 22 targetSdkVersion.apiLevel = 22
versionCode = 1 versionCode = 1
versionName = "1.0" versionName = '1.0'
} }
ndk { ndk {
moduleName = "echo" moduleName = 'echo'
//toolchain = "clang" //toolchain = "clang"
stl = "c++_static" stl = 'c++_static' //std::mutex not in gnustl_static
cppFlags.add("-std=c++11") cppFlags.add('-std=c++11')
ldLibs.addAll(['android', 'log', 'OpenSLES', 'atomic']) ldLibs.addAll(['android', 'log', 'OpenSLES', 'atomic'])
} }
buildTypes { buildTypes {

28
endless-tunnel/app/build.gradle
View File

@@ -19,36 +19,36 @@ apply plugin: 'com.android.model.application'
model { model {
android { android {
compileSdkVersion = 23 compileSdkVersion = 23
buildToolsVersion = "23.0.2" buildToolsVersion = '23.0.2'
defaultConfig { defaultConfig {
minSdkVersion.apiLevel = 9 minSdkVersion.apiLevel = 9
targetSdkVersion.apiLevel = 23 targetSdkVersion.apiLevel = 23
versionCode = 1 versionCode = 1
versionName = "1.0" versionName = '1.0'
} }
ndk { ndk {
moduleName = "game" moduleName = 'game'
stl = "gnustl_static" // recommending gnustl_static/gnustl_shared for android stl = 'gnustl_static' // recommending gnustl_static/gnustl_shared for android
cppFlags.addAll(["-std=c++11", // glm could not take -Wall -Werror cppFlags.addAll(['-std=c++11', // glm could not take -Wall -Werror
"-D GLM_FORCE_SIZE_T_LENGTH", "-D GLM_FORCE_RADIANS", '-D GLM_FORCE_SIZE_T_LENGTH', '-D GLM_FORCE_RADIANS',
"-I" + file("src/main/jni"), '-I' + file('src/main/jni'),
"-I" + file("src/main/jni/data")]) '-I' + file('src/main/jni/data')])
ldLibs.addAll(["android", "EGL", "GLESv2", "OpenSLES", "log"]) ldLibs.addAll(['android', 'EGL', 'GLESv2', 'OpenSLES', 'log'])
} }
// Turn on hard float support in armeabi-v7a // Turn on hard float support in armeabi-v7a
abis { abis {
create("armeabi-v7a") { create('armeabi-v7a') {
cppFlags.addAll(["-mhard-float", "-D_NDK_MATH_NO_SOFTFP=1", "-mfloat-abi=hard"]) cppFlags.addAll(['-mhard-float', '-D_NDK_MATH_NO_SOFTFP=1', '-mfloat-abi=hard'])
ldLibs.add("m_hard") ldLibs.add('m_hard')
ldFlags.add("-Wl,--no-warn-mismatch") ldFlags.add('-Wl,--no-warn-mismatch')
} }
} }
sources { sources {
main { main {
jni { jni {
dependencies { dependencies {
project ":nativeactivity" linkage "static" project ':nativeactivity' linkage 'static'
} }
} }
} }

10
endless-tunnel/nativeactivity/build.gradle
View File

@@ -11,17 +11,17 @@ if (propertiesFile.exists()) {
model { model {
android { android {
compileSdkVersion = 23 compileSdkVersion = 23
buildToolsVersion = "23.0.2" buildToolsVersion = '23.0.2'
defaultConfig.with { defaultConfig.with {
minSdkVersion.apiLevel = 9 minSdkVersion.apiLevel = 9
targetSdkVersion.apiLevel = 23 targetSdkVersion.apiLevel = 23
versionCode = 1 versionCode = 1
versionName = "0.0.1" versionName = '0.0.1'
} }
ndk { ndk {
moduleName = "native-activity" moduleName = 'native-activity'
ldLibs.addAll(["log", "android"]) ldLibs.addAll(['log', 'android'])
ldFlags.add("-c") ldFlags.add('-c')
} }
sources { sources {
main { main {

20
hello-gl2/app/build.gradle
View File

@@ -3,24 +3,24 @@ apply plugin: 'com.android.model.application'
model { model {
android { android {
compileSdkVersion = 23 compileSdkVersion = 23
buildToolsVersion = "23.0.2" buildToolsVersion = '23.0.2'
defaultConfig { defaultConfig {
applicationId = "com.android.gl2jni" applicationId = 'com.android.gl2jni'
minSdkVersion.apiLevel = 5 minSdkVersion.apiLevel = 5
targetSdkVersion.apiLevel = 23 targetSdkVersion.apiLevel = 23
} }
ndk { ndk {
moduleName = "gl2jni" moduleName = 'gl2jni'
stl = "gnustl_static" stl = 'gnustl_static'
cppFlags.addAll(["-std=c++11","-Wall", "-Werror"]) cppFlags.addAll(['-std=c++11','-Wall', '-Werror'])
ldLibs.addAll(["log", "GLESv2"]) ldLibs.addAll(['log', 'GLESv2'])
} }
// Turn on hard float support in armeabi-v7a // Turn on hard float support in armeabi-v7a
abis { abis {
create("armeabi-v7a") { create('armeabi-v7a') {
cppFlags.addAll(["-mhard-float", "-D_NDK_MATH_NO_SOFTFP=1", "-mfloat-abi=hard"]) cppFlags.addAll(['-mhard-float', '-D_NDK_MATH_NO_SOFTFP=1', '-mfloat-abi=hard'])
ldLibs.add("m_hard") ldLibs.add('m_hard')
ldFlags.add("-Wl,--no-warn-mismatch") ldFlags.add('-Wl,--no-warn-mismatch')
} }
} }
buildTypes { buildTypes {

11
native-plasma/app/build.gradle
View File

@@ -3,23 +3,22 @@ apply plugin: 'com.android.model.application'
model { model {
android { android {
compileSdkVersion = 23 compileSdkVersion = 23
buildToolsVersion = "23.0.2" buildToolsVersion = '23.0.2'
defaultConfig { defaultConfig {
applicationId="com.example.native_plasma" applicationId='com.example.native_plasma'
minSdkVersion.apiLevel = 9 minSdkVersion.apiLevel = 9
targetSdkVersion.apiLevel = 23 targetSdkVersion.apiLevel = 23
} }
ndk { ndk {
moduleName = "native-plasma" moduleName = 'native-plasma'
CFlags.add("-I" + file("src/main/jni/native_app_glue")) ldLibs.addAll(['m', 'log','android'])
ldLibs.addAll(["m", "log","android"])
} }
sources { sources {
main { main {
jni { jni {
dependencies { dependencies {
project ":nativeactivity" linkage "static" project ':nativeactivity' linkage 'static'
} }
} }
} }

10
native-plasma/nativeactivity/build.gradle
View File

@@ -11,17 +11,17 @@ if (propertiesFile.exists()) {
model { model {
android { android {
compileSdkVersion = 23 compileSdkVersion = 23
buildToolsVersion = "23.0.2" buildToolsVersion = '23.0.2'
defaultConfig.with { defaultConfig.with {
minSdkVersion.apiLevel = 9 minSdkVersion.apiLevel = 9
targetSdkVersion.apiLevel = 23 targetSdkVersion.apiLevel = 23
versionCode = 1 versionCode = 1
versionName = "0.0.1" versionName = '0.0.1'
} }
ndk { ndk {
moduleName = "native-activity" moduleName = 'native-activity'
ldLibs.addAll(["log", "android"]) ldLibs.addAll(['log', 'android'])
ldFlags.add("-c") ldFlags.add('-c')
} }
sources { sources {
main { main {

10
sensor-graph/app/build.gradle
View File

@@ -3,21 +3,21 @@ apply plugin: 'com.android.model.application'
model { model {
android { android {
compileSdkVersion = 23 compileSdkVersion = 23
buildToolsVersion = "23.0.2" buildToolsVersion = '23.0.2'
defaultConfig { defaultConfig {
applicationId = "com.android.sensorgraph" applicationId = 'com.android.sensorgraph'
minSdkVersion.apiLevel = 8 minSdkVersion.apiLevel = 8
targetSdkVersion.apiLevel = 23 targetSdkVersion.apiLevel = 23
} }
ndk { ndk {
moduleName = "sensorgraph" moduleName = 'sensorgraph'
// for clang to build, need to remove mips or remove -Werror // for clang to build, need to remove mips or remove -Werror
// toolchain = 'clang' // toolchain = 'clang'
// abiFilters.addAll(['armeabi','armeabi-v7a', 'arm64-v8a', 'x86', 'x86-64']) // abiFilters.addAll(['armeabi','armeabi-v7a', 'arm64-v8a', 'x86', 'x86-64'])
stl = "gnustl_static" stl = 'gnustl_static'
cppFlags.addAll(['-std=c++11','-Wall', '-Werror']) cppFlags.addAll(['-std=c++11','-Wall', '-Werror'])
ldLibs.addAll(["log", "GLESv2", "android"]) ldLibs.addAll([ 'android', 'log', 'GLESv2'])
} }
buildTypes { buildTypes {
release { release {