diff options
| author | Michael Lentine <mlentine@google.com> | 2015-12-11 10:49:51 -0800 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2015-12-29 17:12:14 -0700 |
| commit | c68df9cd7c308ea5484b3309e99bd5ad933943c8 (patch) | |
| tree | 3b0ec2881e047868eb8b704455b07fdedf817b34 /buildAndroid | |
| parent | fd18d28f99c3b2b8f788a840522c4a9eab03057e (diff) | |
| download | usermoji-c68df9cd7c308ea5484b3309e99bd5ad933943c8.tar.xz | |
layers: MR89, Fix gtests for android
Conflicts:
layers/draw_state.cpp
layers/image.cpp
layers/mem_tracker.cpp
Diffstat (limited to 'buildAndroid')
| -rw-r--r-- | buildAndroid/jni/Android.mk | 12 | ||||
| -rw-r--r-- | buildAndroid/jni/Application.mk | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/buildAndroid/jni/Android.mk b/buildAndroid/jni/Android.mk index 167509d2..f8d93713 100644 --- a/buildAndroid/jni/Android.mk +++ b/buildAndroid/jni/Android.mk @@ -63,6 +63,18 @@ LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
+LOCAL_MODULE := VKLayerDeviceLimits
+LOCAL_SRC_FILES += $(SRC_DIR)/layers/device_limits.cpp
+LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_debug_marker_table.cpp
+LOCAL_C_INCLUDES += $(SRC_DIR)/include \
+ $(SRC_DIR)/buildAndroid/generated \
+ $(SRC_DIR)/loader
+LOCAL_STATIC_LIBRARIES += layer_utils
+LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
+LOCAL_LDLIBS := -llog
+include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
LOCAL_MODULE := VKLayerImage
LOCAL_SRC_FILES += $(SRC_DIR)/layers/image.cpp
LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp
diff --git a/buildAndroid/jni/Application.mk b/buildAndroid/jni/Application.mk index d89707fe..f5aa22cb 100644 --- a/buildAndroid/jni/Application.mk +++ b/buildAndroid/jni/Application.mk @@ -15,6 +15,6 @@ 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 VKLayerImage VKLayerParamChecker VKLayerGeneric VKLayerAPIDump VKLayerObjectTracker VKLayerThreading VKLayerValidationTests
+APP_MODULES := layer_utils VKLayerBasic VKLayerDrawState VKLayerMemTracker VKLayerDeviceLimits VKLayerImage VKLayerParamChecker VKLayerGeneric VKLayerAPIDump VKLayerObjectTracker VKLayerThreading VKLayerValidationTests
APP_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES
NDK_TOOLCHAIN_VERSION := 4.8
|