aboutsummaryrefslogtreecommitdiff
path: root/buildAndroid
diff options
context:
space:
mode:
authorMichael Lentine <mlentine@google.com>2015-11-20 12:11:42 -0800
committerMark Lobodzinski <mark@lunarg.com>2015-11-20 15:19:03 -0700
commitb3fe0574ceb3f5f3ff10134ce8f94a2e80adeef8 (patch)
treee99839fc03b3c78923f86928f8b73b75c11edc09 /buildAndroid
parentfefe4d35377b7a582ccaefc913e5944a7a33471b (diff)
downloadusermoji-b3fe0574ceb3f5f3ff10134ce8f94a2e80adeef8.tar.xz
Fix build in master
Use dispatchable handles in mdd, fix include path for vulkan.h, and do not build armeabi.
Diffstat (limited to 'buildAndroid')
-rw-r--r--buildAndroid/jni/Application.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/buildAndroid/jni/Application.mk b/buildAndroid/jni/Application.mk
index a711c5bf..1962e681 100644
--- a/buildAndroid/jni/Application.mk
+++ b/buildAndroid/jni/Application.mk
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-APP_ABI := all
+APP_ABI := armeabi-v7a arm64-v8a x86 x86_64 mips mips64
APP_PLATFORM := android-22
APP_STL := gnustl_static
APP_MODULES := layer_utils VKLayerBasic VKLayerDrawState VKLayerMemTracker VKLayerShaderCheker VKLayerImage VKLayerParamChecker VKLayerGeneric VKLayerAPIDump VKLayerObjectTracker VKLayerThreading VKLayerValidationTests