Skip to content

Commit 1b8ffe3

Browse files
author
Andrew Hsieh
committed
Move Teapot to android-17 and set APP_ABI := all
For the default configuration to run on more devices: ARM/Intel/MIPS >= API17 Change-Id: I52145374d0c51624c7a295dc8092f8492e591dee
1 parent f74a8b0 commit 1b8ffe3

35 files changed

+1
-1
lines changed

‎ndk/platforms/android-18/samples/Teapot/AndroidManifest.xml‎ renamed to ‎ndk/platforms/android-17/samples/Teapot/AndroidManifest.xml‎

File renamed without changes.

‎ndk/platforms/android-18/samples/Teapot/assets/Shaders/ShaderPlain.fsh‎ renamed to ‎ndk/platforms/android-17/samples/Teapot/assets/Shaders/ShaderPlain.fsh‎

File renamed without changes.

‎ndk/platforms/android-18/samples/Teapot/assets/Shaders/VS_ShaderPlain.vsh‎ renamed to ‎ndk/platforms/android-17/samples/Teapot/assets/Shaders/VS_ShaderPlain.vsh‎

File renamed without changes.

‎ndk/platforms/android-18/samples/Teapot/jni/Android.mk‎ renamed to ‎ndk/platforms/android-17/samples/Teapot/jni/Android.mk‎

File renamed without changes.

‎ndk/platforms/android-18/samples/Teapot/jni/Application.mk‎ renamed to ‎ndk/platforms/android-17/samples/Teapot/jni/Application.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
APP_PLATFORM := android-9
2-
APP_ABI := armeabi-v7a
2+
APP_ABI := all
33

44
APP_STL := stlport_static

‎ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/JNIHelper.cpp‎ renamed to ‎ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/JNIHelper.cpp‎

File renamed without changes.

‎ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/JNIHelper.h‎ renamed to ‎ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/JNIHelper.h‎

File renamed without changes.

‎ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/NDKSupport.h‎ renamed to ‎ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/NDKSupport.h‎

File renamed without changes.

‎ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/gestureDetector.cpp‎ renamed to ‎ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/gestureDetector.cpp‎

File renamed without changes.

‎ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/gestureDetector.h‎ renamed to ‎ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/gestureDetector.h‎

File renamed without changes.

0 commit comments

Comments
 (0)