diff options
| author | Paul Thomson <paulthomson@google.com> | 2021-02-02 21:06:24 +0000 |
|---|---|---|
| committer | Paul Thomson <paulthomson@google.com> | 2021-02-04 20:24:48 +0000 |
| commit | 94989c24540a0a764428c7ba303d050cce2fdbe5 (patch) | |
| tree | 360251ccd65620f2c49615a0e53d2013a4577c71 /android_test | |
| parent | 059f11383ed1d44a872ce0c30308ab53f3f3c3e7 (diff) | |
| parent | 4d0115cccfcb3b73d20b6513b1c40748e6403c50 (diff) | |
| download | amber-94989c24540a0a764428c7ba303d050cce2fdbe5.tar.gz | |
Merge commit '4d0115cccfcb3b73d20b6513b1c40748e6403c50' into sc-dev
Conflicts:
Android.mk
samples/Android.mk
third_party/Android.mk
Bug: b/169021525
Change-Id: I9c24ae3e9d5cad75e2360325f1cdc1f77b0f7c35
Diffstat (limited to 'android_test')
| -rw-r--r-- | android_test/jni/Application.mk | 3 | ||||
| -rw-r--r-- | android_test/test.cc | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/android_test/jni/Application.mk b/android_test/jni/Application.mk index e17fb4c..549f512 100644 --- a/android_test/jni/Application.mk +++ b/android_test/jni/Application.mk @@ -15,5 +15,4 @@ APP_ABI := arm64-v8a # armeabi-v7a x86 x86_64 APP_BUILD_SCRIPT := Android.mk APP_STL := c++_static -APP_PLATFORM := android-14 -NDK_TOOLCHAIN_VERSION := 4.9 +APP_PLATFORM := android-24 # minimal version to get libvulkan diff --git a/android_test/test.cc b/android_test/test.cc index 81c50f3..ef14800 100644 --- a/android_test/test.cc +++ b/android_test/test.cc @@ -17,5 +17,5 @@ #include "amber/amber.h" void android_main(struct android_app* /*state*/) { - amber::Amber amber; + amber::Amber amber(nullptr); } |