Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

force JavaVersion.VERSION_1_7 for all samples #91

Merged
merged 2 commits into from
Sep 3, 2015
Merged

force JavaVersion.VERSION_1_7 for all samples #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0df9921
gradle: force java 7
proppy Sep 3, 2015
9091ef1
gles3jni: force java7
proppy Sep 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions MoreTeapots/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ model {
targetSdkVersion.apiLevel = 23
}
}

compileOptions.with {
sourceCompatibility=JavaVersion.VERSION_1_7
targetCompatibility=JavaVersion.VERSION_1_7
}

android.ndk {
moduleName ="MoreTeapotsNativeActivity"
cppFlags += "-I${file("src/main/jni/cpufeatures")}".toString()
Expand Down
6 changes: 6 additions & 0 deletions Teapot/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ model {
}

}

compileOptions.with {
sourceCompatibility=JavaVersion.VERSION_1_7
targetCompatibility=JavaVersion.VERSION_1_7
}

android.ndk {
moduleName = "TeapotNativeActivity"
cppFlags += "-I${file("src/main/jni/native_app_glue")}".toString()
Expand Down
6 changes: 6 additions & 0 deletions audio-echo/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ model {
targetCompatibility=JavaVersion.VERSION_1_7
}
}

compileOptions.with {
sourceCompatibility=JavaVersion.VERSION_1_7
targetCompatibility=JavaVersion.VERSION_1_7
}

android.ndk {
moduleName = "echo"
cppFlags += ["-std=c++11"]
Expand Down
6 changes: 6 additions & 0 deletions bitmap-plasma/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ model {
}

}

compileOptions.with {
sourceCompatibility=JavaVersion.VERSION_1_7
targetCompatibility=JavaVersion.VERSION_1_7
}

android.ndk {
moduleName = "plasma"
ldLibs += ["m","log","jnigraphics"]
Expand Down
6 changes: 6 additions & 0 deletions endless-tunnel/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ model {
versionName = "1.0"
}
}

compileOptions.with {
sourceCompatibility=JavaVersion.VERSION_1_7
targetCompatibility=JavaVersion.VERSION_1_7
}

android.ndk {
moduleName = "game"
cppFlags += "-I${file("src/main/jni/native_app_glue")}".toString()
Expand Down
4 changes: 4 additions & 0 deletions gles3jni/app/build-11.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ model {
targetSdkVersion.apiLevel = 23
}
}
compileOptions.with {
sourceCompatibility=JavaVersion.VERSION_1_7
targetCompatibility=JavaVersion.VERSION_1_7
}
android.ndk {
moduleName = "gles3jni"
cppFlags += "-Werror"
Expand Down
4 changes: 4 additions & 0 deletions gles3jni/app/build-18.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ model {
targetSdkVersion.apiLevel = 23
}
}
compileOptions.with {
sourceCompatibility=JavaVersion.VERSION_1_7
targetCompatibility=JavaVersion.VERSION_1_7
}
android.ndk {
moduleName = "gles3jni"
cppFlags += "-Werror"
Expand Down
6 changes: 6 additions & 0 deletions hello-gl2/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ model {
targetSdkVersion.apiLevel = 23
}
}

compileOptions.with {
sourceCompatibility=JavaVersion.VERSION_1_7
targetCompatibility=JavaVersion.VERSION_1_7
}

android.ndk {
moduleName = "gl2jni"
cppFlags += "-Werror"
Expand Down
6 changes: 6 additions & 0 deletions hello-jni/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ model {
targetSdkVersion.apiLevel = 23
}
}

compileOptions.with {
sourceCompatibility=JavaVersion.VERSION_1_7
targetCompatibility=JavaVersion.VERSION_1_7
}

/*
* native build settings
*/
Expand Down
6 changes: 6 additions & 0 deletions hello-thirdparty/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ model {
targetSdkVersion.apiLevel = 23
}
}

compileOptions.with {
sourceCompatibility=JavaVersion.VERSION_1_7
targetCompatibility=JavaVersion.VERSION_1_7
}

android.ndk {
moduleName = "native-activity"
cppFlags += "-I${file("src/main/jni")}".toString()
Expand Down
6 changes: 6 additions & 0 deletions native-activity/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ model {
targetSdkVersion.apiLevel = 23
}
}

compileOptions.with {
sourceCompatibility=JavaVersion.VERSION_1_7
targetCompatibility=JavaVersion.VERSION_1_7
}

android.ndk {
moduleName ="native-activity"
CFlags += "-I${file("src/main/jni/native_app_glue")}".toString()
Expand Down
6 changes: 6 additions & 0 deletions native-audio/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ model {

}
}

compileOptions.with {
sourceCompatibility=JavaVersion.VERSION_1_7
targetCompatibility=JavaVersion.VERSION_1_7
}

android.ndk {
moduleName = "native-audio-jni"
ldLibs += ["android","OpenSLES", "log"]
Expand Down
6 changes: 6 additions & 0 deletions native-codec/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ model {
proguardFiles += file('proguard-rules.txt')
}
}

compileOptions.with {
sourceCompatibility=JavaVersion.VERSION_1_7
targetCompatibility=JavaVersion.VERSION_1_7
}

android.ndk {
moduleName = "native-codec-jni"
cppFlags += "-UNDEBUG"
Expand Down
6 changes: 6 additions & 0 deletions native-media/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ model {

}
}

compileOptions.with {
sourceCompatibility=JavaVersion.VERSION_1_7
targetCompatibility=JavaVersion.VERSION_1_7
}

android.ndk {
moduleName = "native-media-jni"
CFlags += "-UNDEBUG"
Expand Down
6 changes: 6 additions & 0 deletions native-plasma/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ model {
targetSdkVersion.apiLevel = 23
}
}

compileOptions.with {
sourceCompatibility=JavaVersion.VERSION_1_7
targetCompatibility=JavaVersion.VERSION_1_7
}

android.ndk {
moduleName = "native-plasma"
CFlags += "-I${file("src/main/jni/native_app_glue")}".toString()
Expand Down
6 changes: 6 additions & 0 deletions san-angeles/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ model {
targetSdkVersion.apiLevel = 23
}
}

compileOptions.with {
sourceCompatibility=JavaVersion.VERSION_1_7
targetCompatibility=JavaVersion.VERSION_1_7
}

android.ndk {
moduleName = "sanangeles"
CFlags += "-DANDROID_NDK"
Expand Down
6 changes: 6 additions & 0 deletions sensor-graph/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ model {
targetSdkVersion.apiLevel = 23
}
}

compileOptions.with {
sourceCompatibility=JavaVersion.VERSION_1_7
targetCompatibility=JavaVersion.VERSION_1_7
}

android.ndk {
moduleName = "sensorgraph"
cppFlags += "-Werror"
Expand Down