From c6f78d2eae9efbe0c96f97bc50be2aff74dce49a Mon Sep 17 00:00:00 2001 From: guanghuafan Date: Mon, 19 Sep 2016 09:46:07 -0700 Subject: [PATCH] Fix Readme.md issues and other minor modifications --- README.md | 4 ---- audio-echo/build.gradle | 2 +- bitmap-plasma/README.md | 2 +- bitmap-plasma/build.gradle | 2 +- endless-tunnel/README.md | 2 +- endless-tunnel/build.gradle | 2 +- gles3jni/README.md | 2 +- gles3jni/build.gradle | 2 +- hello-gl2/README.md | 2 +- hello-gl2/build.gradle | 2 +- hello-jni/README.md | 2 +- hello-jni/build.gradle | 2 +- hello-jniCallback/README.md | 2 +- hello-jniCallback/build.gradle | 2 +- hello-libs/README.md | 2 +- hello-libs/build.gradle | 2 +- hello-libs/settings.gradle | 7 ------- hello-neon/README.md | 2 +- hello-neon/build.gradle | 2 +- native-activity/README.md | 2 +- native-activity/build.gradle | 2 +- native-audio/README.md | 2 +- native-audio/build.gradle | 2 +- native-codec/README.md | 2 +- native-codec/build.gradle | 2 +- native-media/README.md | 2 +- native-media/build.gradle | 2 +- native-plasma/README.md | 2 +- native-plasma/build.gradle | 2 +- other-builds/ndkbuild/bitmap-plasma/build.gradle | 2 +- other-builds/ndkbuild/gles3jni/build.gradle | 2 +- other-builds/ndkbuild/hello-gl2/build.gradle | 2 +- other-builds/ndkbuild/hello-jni/build.gradle | 2 +- other-builds/ndkbuild/hello-libs/build.gradle | 2 +- other-builds/ndkbuild/hello-neon/build.gradle | 2 +- other-builds/ndkbuild/native-activity/build.gradle | 2 +- other-builds/ndkbuild/native-audio/build.gradle | 2 +- other-builds/ndkbuild/native-codec/build.gradle | 2 +- other-builds/ndkbuild/native-media/build.gradle | 2 +- other-builds/ndkbuild/native-plasma/build.gradle | 2 +- other-builds/ndkbuild/san-angeles/build.gradle | 2 +- other-builds/ndkbuild/teapots/build.gradle | 2 +- other-builds/ndkbuild/two-libs/build.gradle | 2 +- san-angeles/build.gradle | 2 +- sensor-graph/README.md | 2 +- sensor-graph/build.gradle | 2 +- teapots/README.md | 9 ++++++--- teapots/build.gradle | 2 +- webp/README.md | 2 +- webp/build.gradle | 2 +- 50 files changed, 53 insertions(+), 61 deletions(-) diff --git a/README.md b/README.md index f88eb5d1..e6da66f1 100644 --- a/README.md +++ b/README.md @@ -17,10 +17,6 @@ Known Issues For samples using `Android.mk` build system with `ndk-build` see the [android-mk](https://github.com/googlesamples/android-ndk/tree/android-mk) branch. -Debugging ---------- -- [hello-jni-codelab](https://codelabs.developers.google.com/codelabs/android-studio-jni/index.html?index=..%2F..%2Findex#0) -- [REFERENCE.md](REFERENCE.md) Support ------- diff --git a/audio-echo/build.gradle b/audio-echo/build.gradle index e9c2eedd..b1932998 100644 --- a/audio-echo/build.gradle +++ b/audio-echo/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/bitmap-plasma/README.md b/bitmap-plasma/README.md index b670e47d..fb43da1c 100644 --- a/bitmap-plasma/README.md +++ b/bitmap-plasma/README.md @@ -2,7 +2,7 @@ Bitmap Plasma ============= Bitmap Plasma is an Android sample that uses JNI to render a plasma effect in an Android [Bitmap](http://developer.android.com/reference/android/graphics/Bitmap.html) from C code. -This sample uses the new [Gradle Experimental Android plugin](http://tools.android.com/tech-docs/new-build-system/gradle-experimental) with C++ support. +This sample uses the new [Android Studio CMake plugin](http://tools.android.com/tech-docs/external-c-builds) with C++ support. Pre-requisites -------------- diff --git a/bitmap-plasma/build.gradle b/bitmap-plasma/build.gradle index 26e6fc8c..68faf17e 100644 --- a/bitmap-plasma/build.gradle +++ b/bitmap-plasma/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/endless-tunnel/README.md b/endless-tunnel/README.md index bc0826d9..fb9a185e 100644 --- a/endless-tunnel/README.md +++ b/endless-tunnel/README.md @@ -12,7 +12,7 @@ integration. For example, this game contains textures and geometry hard-coded in code, which works for small demo games like this one, but doesn't scale well to real games. -This sample uses the new [Gradle Experimental Android plugin](http://tools.android.com/tech-docs/new-build-system/gradle-experimental) with C++ support. +This sample uses the new [Android Studio CMake plugin](http://tools.android.com/tech-docs/external-c-builds) with C++ support. Pre-requisites -------------- diff --git a/endless-tunnel/build.gradle b/endless-tunnel/build.gradle index 26e6fc8c..68faf17e 100644 --- a/endless-tunnel/build.gradle +++ b/endless-tunnel/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/gles3jni/README.md b/gles3jni/README.md index 4f83314d..8cbfd0e9 100644 --- a/gles3jni/README.md +++ b/gles3jni/README.md @@ -11,7 +11,7 @@ OpenGL ES 2.0 path: - Explicit assignment of attribute locations, eliminating the need to query assignments. -This sample uses the new [Gradle Experimental Android plugin](http://tools.android.com/tech-docs/new-build-system/gradle-experimental) with C++ support. +This sample uses the new [Android Studio CMake plugin](http://tools.android.com/tech-docs/external-c-builds) with C++ support. Pre-requisites -------------- diff --git a/gles3jni/build.gradle b/gles3jni/build.gradle index 26e6fc8c..68faf17e 100644 --- a/gles3jni/build.gradle +++ b/gles3jni/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/hello-gl2/README.md b/hello-gl2/README.md index 0fe7501f..5f56d23e 100644 --- a/hello-gl2/README.md +++ b/hello-gl2/README.md @@ -6,7 +6,7 @@ It uses JNI to do the rendering in C++ over a [GLSurfaceView](http://developer.android.com/reference/android/opengl/GLSurfaceView.html) created from a regular Android Java Activity. -This sample uses the new [Gradle Experimental Android plugin](http://tools.android.com/tech-docs/new-build-system/gradle-experimental) with C++ support. +This sample uses the new [Android Studio CMake plugin](http://tools.android.com/tech-docs/external-c-builds) with C++ support. Pre-requisites -------------- diff --git a/hello-gl2/build.gradle b/hello-gl2/build.gradle index 26e6fc8c..68faf17e 100644 --- a/hello-gl2/build.gradle +++ b/hello-gl2/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/hello-jni/README.md b/hello-jni/README.md index 91344a92..8d40378f 100644 --- a/hello-jni/README.md +++ b/hello-jni/README.md @@ -2,7 +2,7 @@ Hello JNI ========= Hello JNI is an Android sample that uses JNI to call C code from a Android Java Activity. -This sample uses the new [Gradle Experimental Android plugin](http://tools.android.com/tech-docs/new-build-system/gradle-experimental) with C++ support. +This sample uses the new [Android Studio CMake plugin](http://tools.android.com/tech-docs/external-c-builds) with C++ support. Pre-requisites -------------- diff --git a/hello-jni/build.gradle b/hello-jni/build.gradle index b62d50f2..a3330d48 100644 --- a/hello-jni/build.gradle +++ b/hello-jni/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/hello-jniCallback/README.md b/hello-jniCallback/README.md index 82c722b9..4f49d82b 100644 --- a/hello-jniCallback/README.md +++ b/hello-jniCallback/README.md @@ -4,7 +4,7 @@ This sample is an Aadd-on to Hello JNI sample to demonstrate calling back to Jav - create a java class instance from C code - call java class static and non-static member functions -This sample uses the new [Gradle Experimental Android plugin](http://tools.android.com/tech-docs/new-build-system/gradle-experimental) with C++ support. +This sample uses the new [Android Studio CMake plugin](http://tools.android.com/tech-docs/external-c-builds) with C++ support. Pre-requisites -------------- diff --git a/hello-jniCallback/build.gradle b/hello-jniCallback/build.gradle index b62d50f2..a3330d48 100644 --- a/hello-jniCallback/build.gradle +++ b/hello-jniCallback/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/hello-libs/README.md b/hello-libs/README.md index b9ca0e80..4851dc4c 100644 --- a/hello-libs/README.md +++ b/hello-libs/README.md @@ -2,7 +2,7 @@ Hello-libs ========= Hello-Libs is an Android sample that demos native lib management in Android Studio. -This sample uses the new [Gradle Experimental Android plugin](http://tools.android.com/tech-docs/new-build-system/gradle-experimental) with external lib support. +This sample uses the new [Android Studio CMake plugin](http://tools.android.com/tech-docs/external-c-builds) with external lib support. it includes 2 modules: * app -- uses one shared lib and one static lib from $project/distribution/ * gen-libs -- generates one shared and one static lib, and copy them into $project/distribution diff --git a/hello-libs/build.gradle b/hello-libs/build.gradle index b62d50f2..a3330d48 100644 --- a/hello-libs/build.gradle +++ b/hello-libs/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/hello-libs/settings.gradle b/hello-libs/settings.gradle index 16f9c7d3..573abcb3 100644 --- a/hello-libs/settings.gradle +++ b/hello-libs/settings.gradle @@ -1,9 +1,2 @@ include ':app' -// If you want to generate libs, just uncomment out the following -// and dependency in app/build.gradle - -// include ':gen-libs' - - - diff --git a/hello-neon/README.md b/hello-neon/README.md index 87a8b323..5260a217 100644 --- a/hello-neon/README.md +++ b/hello-neon/README.md @@ -13,7 +13,7 @@ If there are lot of NEON files in the project, make a NEON lib: (this approach is not shown) -This sample uses the new [Gradle Experimental Android plugin](http://tools.android.com/tech-docs/new-build-system/gradle-experimental) with C++ support. +This sample uses the new [Android Studio CMake plugin](http://tools.android.com/tech-docs/external-c-builds) with C++ support. Pre-requisites diff --git a/hello-neon/build.gradle b/hello-neon/build.gradle index b62d50f2..a3330d48 100644 --- a/hello-neon/build.gradle +++ b/hello-neon/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/native-activity/README.md b/native-activity/README.md index 43f4a98d..fc1f0b46 100644 --- a/native-activity/README.md +++ b/native-activity/README.md @@ -2,7 +2,7 @@ Native Activity =============== Native Activity is an Android sample that initializes a GLES 2.0 context and reads accelerometer data from C code using [Native Activity](http://developer.android.com/reference/android/app/NativeActivity.html). -This sample uses the new [Gradle Experimental Android plugin](http://tools.android.com/tech-docs/new-build-system/gradle-experimental) with C++ support. +This sample uses the new [Android Studio CMake plugin](http://tools.android.com/tech-docs/external-c-builds) with C++ support. Pre-requisites -------------- diff --git a/native-activity/build.gradle b/native-activity/build.gradle index 8e4d9b44..5c7e0926 100644 --- a/native-activity/build.gradle +++ b/native-activity/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/native-audio/README.md b/native-audio/README.md index 40e8f8e1..467ee691 100644 --- a/native-audio/README.md +++ b/native-audio/README.md @@ -2,7 +2,7 @@ Native Audio ============ Native Audio is an Android sample that plays and records sounds with the C++ OpenSLES API using JNI. The recorder / players created are not in fast audio path. -This sample uses the new [Gradle Experimental Android plugin](http://tools.android.com/tech-docs/new-build-system/gradle-experimental) with C++ support. +This sample uses the new [Android Studio CMake plugin](http://tools.android.com/tech-docs/external-c-builds) with C++ support. Pre-requisites -------------- diff --git a/native-audio/build.gradle b/native-audio/build.gradle index 26e6fc8c..68faf17e 100644 --- a/native-audio/build.gradle +++ b/native-audio/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/native-codec/README.md b/native-codec/README.md index 5840278c..94450b40 100644 --- a/native-codec/README.md +++ b/native-codec/README.md @@ -12,7 +12,7 @@ To add your own files: - from android device, select your stream -This sample uses the new [Gradle Experimental Android plugin](http://tools.android.com/tech-docs/new-build-system/gradle-experimental) with C++ support. +This sample uses the new [Android Studio CMake plugin](http://tools.android.com/tech-docs/external-c-builds) with C++ support. Pre-requisites -------------- diff --git a/native-codec/build.gradle b/native-codec/build.gradle index 26e6fc8c..68faf17e 100644 --- a/native-codec/build.gradle +++ b/native-codec/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/native-media/README.md b/native-media/README.md index 038fbaa9..4ba89ea5 100644 --- a/native-media/README.md +++ b/native-media/README.md @@ -11,7 +11,7 @@ placed in app/src/main/assets/clips/NativeMedia.ts and encoded as: For demonstration purposes we have supplied such a .ts file, any actual stream must be created according to the MPEG-2 specification. -This sample uses the new [Gradle Experimental Android plugin](http://tools.android.com/tech-docs/new-build-system/gradle-experimental) with C++ support. +This sample uses the new [Android Studio CMake plugin](http://tools.android.com/tech-docs/external-c-builds) with C++ support. Pre-requisites -------------- diff --git a/native-media/build.gradle b/native-media/build.gradle index 26e6fc8c..68faf17e 100644 --- a/native-media/build.gradle +++ b/native-media/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/native-plasma/README.md b/native-plasma/README.md index b17c9fb8..9a1019ed 100644 --- a/native-plasma/README.md +++ b/native-plasma/README.md @@ -2,7 +2,7 @@ Native Plasma ============= Native Plasma is an Android sample that renders a plasma effect in a Bitmap from C code using [Native Activity](http://developer.android.com/reference/android/app/NativeActivity.html). -This sample uses the new [Gradle Experimental Android plugin](http://tools.android.com/tech-docs/new-build-system/gradle-experimental) with C++ support. +This sample uses the new [Android Studio CMake plugin](http://tools.android.com/tech-docs/external-c-builds) with C++ support. Pre-requisites -------------- diff --git a/native-plasma/build.gradle b/native-plasma/build.gradle index 26e6fc8c..68faf17e 100644 --- a/native-plasma/build.gradle +++ b/native-plasma/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/other-builds/ndkbuild/bitmap-plasma/build.gradle b/other-builds/ndkbuild/bitmap-plasma/build.gradle index 784e8d26..305dc055 100644 --- a/other-builds/ndkbuild/bitmap-plasma/build.gradle +++ b/other-builds/ndkbuild/bitmap-plasma/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/other-builds/ndkbuild/gles3jni/build.gradle b/other-builds/ndkbuild/gles3jni/build.gradle index 784e8d26..305dc055 100644 --- a/other-builds/ndkbuild/gles3jni/build.gradle +++ b/other-builds/ndkbuild/gles3jni/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/other-builds/ndkbuild/hello-gl2/build.gradle b/other-builds/ndkbuild/hello-gl2/build.gradle index 784e8d26..305dc055 100644 --- a/other-builds/ndkbuild/hello-gl2/build.gradle +++ b/other-builds/ndkbuild/hello-gl2/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/other-builds/ndkbuild/hello-jni/build.gradle b/other-builds/ndkbuild/hello-jni/build.gradle index a9bf6ef3..ce7ff1bf 100644 --- a/other-builds/ndkbuild/hello-jni/build.gradle +++ b/other-builds/ndkbuild/hello-jni/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/other-builds/ndkbuild/hello-libs/build.gradle b/other-builds/ndkbuild/hello-libs/build.gradle index b62d50f2..a3330d48 100644 --- a/other-builds/ndkbuild/hello-libs/build.gradle +++ b/other-builds/ndkbuild/hello-libs/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/other-builds/ndkbuild/hello-neon/build.gradle b/other-builds/ndkbuild/hello-neon/build.gradle index 784e8d26..305dc055 100644 --- a/other-builds/ndkbuild/hello-neon/build.gradle +++ b/other-builds/ndkbuild/hello-neon/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/other-builds/ndkbuild/native-activity/build.gradle b/other-builds/ndkbuild/native-activity/build.gradle index 784e8d26..305dc055 100644 --- a/other-builds/ndkbuild/native-activity/build.gradle +++ b/other-builds/ndkbuild/native-activity/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/other-builds/ndkbuild/native-audio/build.gradle b/other-builds/ndkbuild/native-audio/build.gradle index 784e8d26..305dc055 100644 --- a/other-builds/ndkbuild/native-audio/build.gradle +++ b/other-builds/ndkbuild/native-audio/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/other-builds/ndkbuild/native-codec/build.gradle b/other-builds/ndkbuild/native-codec/build.gradle index 784e8d26..305dc055 100644 --- a/other-builds/ndkbuild/native-codec/build.gradle +++ b/other-builds/ndkbuild/native-codec/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/other-builds/ndkbuild/native-media/build.gradle b/other-builds/ndkbuild/native-media/build.gradle index 784e8d26..305dc055 100644 --- a/other-builds/ndkbuild/native-media/build.gradle +++ b/other-builds/ndkbuild/native-media/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/other-builds/ndkbuild/native-plasma/build.gradle b/other-builds/ndkbuild/native-plasma/build.gradle index 784e8d26..305dc055 100644 --- a/other-builds/ndkbuild/native-plasma/build.gradle +++ b/other-builds/ndkbuild/native-plasma/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/other-builds/ndkbuild/san-angeles/build.gradle b/other-builds/ndkbuild/san-angeles/build.gradle index 784e8d26..305dc055 100644 --- a/other-builds/ndkbuild/san-angeles/build.gradle +++ b/other-builds/ndkbuild/san-angeles/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/other-builds/ndkbuild/teapots/build.gradle b/other-builds/ndkbuild/teapots/build.gradle index 784e8d26..305dc055 100644 --- a/other-builds/ndkbuild/teapots/build.gradle +++ b/other-builds/ndkbuild/teapots/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/other-builds/ndkbuild/two-libs/build.gradle b/other-builds/ndkbuild/two-libs/build.gradle index 784e8d26..305dc055 100644 --- a/other-builds/ndkbuild/two-libs/build.gradle +++ b/other-builds/ndkbuild/two-libs/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/san-angeles/build.gradle b/san-angeles/build.gradle index 26e6fc8c..68faf17e 100644 --- a/san-angeles/build.gradle +++ b/san-angeles/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/sensor-graph/README.md b/sensor-graph/README.md index 51acc8a0..0f9318f9 100644 --- a/sensor-graph/README.md +++ b/sensor-graph/README.md @@ -6,7 +6,7 @@ It demonstrate usage of the following Native C++ API: - [Sensors](http://developer.android.com/ndk/reference/group___sensor.html) - [Assets](http://developer.android.com/ndk/reference/group___asset.html) -This sample uses the new [Gradle Experimental Android plugin](http://tools.android.com/tech-docs/new-build-system/gradle-experimental) with C++ support. +This sample uses the new [Android Studio CMake plugin](http://tools.android.com/tech-docs/external-c-builds) with C++ support. Pre-requisites -------------- diff --git a/sensor-graph/build.gradle b/sensor-graph/build.gradle index 26e6fc8c..68faf17e 100644 --- a/sensor-graph/build.gradle +++ b/sensor-graph/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/teapots/README.md b/teapots/README.md index b0eb6df4..9f13b201 100644 --- a/teapots/README.md +++ b/teapots/README.md @@ -1,8 +1,11 @@ -Teapot +Teapots ====== -Teapot is an Android C++ sample that draws a Teapot mesh using GLES 2.0 API and [NativeActivity](http://developer.android.com/reference/android/app/NativeActivity.html). +Teapots is an collection of Android C++ samples that uses a Teapot rendering to demostrate Android NDK platform features: +- classic-teapot: Rendering classic teapot mesh using GLES 2.0 API and [NativeActivity](http://developer.android.com/reference/android/app/NativeActivity.html). +- more-teapots: Rendering multiple instances of Classic Teapot with GLES 3.0 Instance Rendering +- Choreographer-30fps: demonstrates multiple frame rate throttoling techniques based on API level using Chreographer API and EGL Android presentation time extension. -This sample uses the new [Gradle Experimental Android plugin](http://tools.android.com/tech-docs/new-build-system/gradle-experimental) with C++ support. +This sample uses the new [Android Studio CMake plugin](http://tools.android.com/tech-docs/external-c-builds) with C++ support. Pre-requisites -------------- diff --git a/teapots/build.gradle b/teapots/build.gradle index 26e6fc8c..68faf17e 100644 --- a/teapots/build.gradle +++ b/teapots/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/webp/README.md b/webp/README.md index 5decbf25..60570e36 100644 --- a/webp/README.md +++ b/webp/README.md @@ -5,7 +5,7 @@ view: - rotate decoding 3 webp images and load them into on-screen buffer. Decoding is in its own thread -This sample uses the new [Android CMake](http://tools.android.com/tech-docs/external-c-builds) with C++ support. +This sample uses the new [Android Studio CMake plugin](http://tools.android.com/tech-docs/external-c-builds). Pre-requisites -------------- diff --git a/webp/build.gradle b/webp/build.gradle index 26e6fc8c..68faf17e 100644 --- a/webp/build.gradle +++ b/webp/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0' } }