diff options
| author | Dave Houlton <daveh@lunarg.com> | 2018-11-28 13:08:09 -0700 |
|---|---|---|
| committer | Dave Houlton <daveh@lunarg.com> | 2019-01-04 15:20:08 -0700 |
| commit | d3e046de4adae0e0ae7a9e0f9d12de808e4efccc (patch) | |
| tree | 71babc51b7083c2ef3b530b4aaca6ce43a264d61 /build-android | |
| parent | e48cd11a7dba74e02b843ab8b3a1325f3db3ca4a (diff) | |
| download | vulkan-validation-layers-d3e046de4adae0e0ae7a9e0f9d12de808e4efccc.tar.gz | |
tests: add AHB extension tests
Add tests for the new Android Hardware Buffer extension VUIDs.
Update build script to min package level supporting AHB.
Includes some #ifdef & duplicated ndk definitions to allow testing
on Windows/MockICD, which should be removed when device testing is
available.
Change-Id: Iafedd20492aa97b0369b41d84635cd01cdcf81e3
Diffstat (limited to 'build-android')
| -rwxr-xr-x | build-android/build_all.sh | 2 | ||||
| -rw-r--r-- | build-android/jni/Application.mk | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/build-android/build_all.sh b/build-android/build_all.sh index 0b5379380..e280e8614 100755 --- a/build-android/build_all.sh +++ b/build-android/build_all.sh @@ -50,7 +50,7 @@ echo LAYER_BUILD_DIR="${LAYER_BUILD_DIR}" echo DEMO_BUILD_DIR="${DEMO_BUILD_DIR}" function create_APK() { - aapt package -f -M AndroidManifest.xml -I "$ANDROID_SDK_HOME/platforms/android-24/android.jar" -S res -F bin/$1-unaligned.apk bin/libs + aapt package -f -M AndroidManifest.xml -I "$ANDROID_SDK_HOME/platforms/android-26/android.jar" -S res -F bin/$1-unaligned.apk bin/libs # update this logic to detect if key is already there. If so, use it, otherwise create it. jarsigner -verbose -keystore ~/.android/debug.keystore -storepass android -keypass android bin/$1-unaligned.apk androiddebugkey zipalign -f 4 bin/$1-unaligned.apk bin/$1.apk diff --git a/build-android/jni/Application.mk b/build-android/jni/Application.mk index 8e0cf7b8e..243c28538 100644 --- a/build-android/jni/Application.mk +++ b/build-android/jni/Application.mk @@ -14,6 +14,7 @@ # limitations under the License. APP_ABI := armeabi-v7a arm64-v8a x86 x86_64 +# APP_ABI := arm64-v8a # just build for pixel2 (don't check in) APP_PLATFORM := android-26 APP_STL := c++_static NDK_TOOLCHAIN_VERSION := clang |