am d496950e: am 06485c81: Merge "Move Teapot to android-17 and set APP_ABI := all"

* commit 'd496950e94883a83348df563c1be26fee95bec4f': Move Teapot to android-17 and set APP_ABI := all
2013-09-17 18:59:59 -07:00
parent c0fa6ffad4 d496950e94
commit c517c3dd34
35 changed files with 1 additions and 1 deletions
--- a/ndk/platforms/android-17/samples/Teapot/AndroidManifest.xml
+++ b/ndk/platforms/android-17/samples/Teapot/AndroidManifest.xml
--- a/ndk/platforms/android-17/samples/Teapot/assets/Shaders/ShaderPlain.fsh
+++ b/ndk/platforms/android-17/samples/Teapot/assets/Shaders/ShaderPlain.fsh
--- a/ndk/platforms/android-17/samples/Teapot/assets/Shaders/VS_ShaderPlain.vsh
+++ b/ndk/platforms/android-17/samples/Teapot/assets/Shaders/VS_ShaderPlain.vsh
--- a/ndk/platforms/android-17/samples/Teapot/jni/Android.mk
+++ b/ndk/platforms/android-17/samples/Teapot/jni/Android.mk
--- a/ndk/platforms/android-17/samples/Teapot/jni/Application.mk
+++ b/ndk/platforms/android-17/samples/Teapot/jni/Application.mk
@@ -1,4 +1,4 @@
 APP_PLATFORM := android-9
-APP_ABI := armeabi-v7a
+APP_ABI := all

 APP_STL := stlport_static
--- a/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/JNIHelper.cpp
+++ b/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/JNIHelper.cpp
--- a/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/JNIHelper.h
+++ b/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/JNIHelper.h
--- a/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/NDKSupport.h
+++ b/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/NDKSupport.h
--- a/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/gestureDetector.cpp
+++ b/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/gestureDetector.cpp
--- a/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/gestureDetector.h
+++ b/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/gestureDetector.h
--- a/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/perfMonitor.cpp
+++ b/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/perfMonitor.cpp
--- a/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/perfMonitor.h
+++ b/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/perfMonitor.h
--- a/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/shader.cpp
+++ b/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/shader.cpp
--- a/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/shader.h
+++ b/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/shader.h
--- a/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/tapCamera.cpp
+++ b/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/tapCamera.cpp
--- a/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/tapCamera.h
+++ b/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/tapCamera.h
--- a/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/vecmath.cpp
+++ b/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/vecmath.cpp
--- a/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/vecmath.h
+++ b/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/vecmath.h
--- a/ndk/platforms/android-17/samples/Teapot/jni/TeapotNativeActivity.cpp
+++ b/ndk/platforms/android-17/samples/Teapot/jni/TeapotNativeActivity.cpp
--- a/ndk/platforms/android-17/samples/Teapot/jni/TeapotRenderer.cpp
+++ b/ndk/platforms/android-17/samples/Teapot/jni/TeapotRenderer.cpp
--- a/ndk/platforms/android-17/samples/Teapot/jni/TeapotRenderer.h
+++ b/ndk/platforms/android-17/samples/Teapot/jni/TeapotRenderer.h
--- a/ndk/platforms/android-17/samples/Teapot/jni/teapot.inl
+++ b/ndk/platforms/android-17/samples/Teapot/jni/teapot.inl
--- a/ndk/platforms/android-17/samples/Teapot/lint.xml
+++ b/ndk/platforms/android-17/samples/Teapot/lint.xml
--- a/ndk/platforms/android-17/samples/Teapot/project.properties
+++ b/ndk/platforms/android-17/samples/Teapot/project.properties
--- a/ndk/platforms/android-17/samples/Teapot/res/drawable-hdpi/ic_launcher.png
+++ b/ndk/platforms/android-17/samples/Teapot/res/drawable-hdpi/ic_launcher.png
--- a/ndk/platforms/android-17/samples/Teapot/res/drawable-ldpi/ic_launcher.png
+++ b/ndk/platforms/android-17/samples/Teapot/res/drawable-ldpi/ic_launcher.png
--- a/ndk/platforms/android-17/samples/Teapot/res/drawable-mdpi/ic_launcher.png
+++ b/ndk/platforms/android-17/samples/Teapot/res/drawable-mdpi/ic_launcher.png
--- a/ndk/platforms/android-17/samples/Teapot/res/drawable-xhdpi/ic_launcher.png
+++ b/ndk/platforms/android-17/samples/Teapot/res/drawable-xhdpi/ic_launcher.png
--- a/ndk/platforms/android-17/samples/Teapot/res/layout/widgets.xml
+++ b/ndk/platforms/android-17/samples/Teapot/res/layout/widgets.xml
--- a/ndk/platforms/android-17/samples/Teapot/res/values-v11/styles.xml
+++ b/ndk/platforms/android-17/samples/Teapot/res/values-v11/styles.xml
--- a/ndk/platforms/android-17/samples/Teapot/res/values-v14/styles.xml
+++ b/ndk/platforms/android-17/samples/Teapot/res/values-v14/styles.xml
--- a/ndk/platforms/android-17/samples/Teapot/res/values/strings.xml
+++ b/ndk/platforms/android-17/samples/Teapot/res/values/strings.xml
--- a/ndk/platforms/android-17/samples/Teapot/res/values/styles.xml
+++ b/ndk/platforms/android-17/samples/Teapot/res/values/styles.xml
--- a/ndk/platforms/android-17/samples/Teapot/src/com/sample/teapot/TeapotApplication.java
+++ b/ndk/platforms/android-17/samples/Teapot/src/com/sample/teapot/TeapotApplication.java
--- a/ndk/platforms/android-17/samples/Teapot/src/com/sample/teapot/TeapotNativeActivity.java
+++ b/ndk/platforms/android-17/samples/Teapot/src/com/sample/teapot/TeapotNativeActivity.java