diff options
| author | Jon Ashburn <jon@lunarg.com> | 2016-02-02 13:25:40 -0700 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2016-02-02 14:38:08 -0700 |
| commit | 0cd6d59491e3e02fef0670a377abc593b9f4d09c (patch) | |
| tree | 0b8dc6358a074cc38d62ee2d704e63d5e35ca1de | |
| parent | 12d08da17af5155c3d29219924ccc450de26d278 (diff) | |
| download | usermoji-0cd6d59491e3e02fef0670a377abc593b9f4d09c.tar.xz | |
androidBuild: remove unused layers api_dump, generic, basic, multi
| -rwxr-xr-x | buildAndroid/android-generate.sh | 2 | ||||
| -rw-r--r-- | buildAndroid/jni/Android.mk | 37 | ||||
| -rw-r--r-- | buildAndroid/jni/Application.mk | 2 |
3 files changed, 1 insertions, 40 deletions
diff --git a/buildAndroid/android-generate.sh b/buildAndroid/android-generate.sh index c8fda268..4c07a6b2 100755 --- a/buildAndroid/android-generate.sh +++ b/buildAndroid/android-generate.sh @@ -22,8 +22,6 @@ python ../vk-generate.py dispatch-table-ops layer > generated/vk_dispatch_table_ python ../vk_helper.py --gen_enum_string_helper ../include/vulkan/vulkan.h --abs_out_dir generated python ../vk_helper.py --gen_struct_wrappers ../include/vulkan/vulkan.h --abs_out_dir generated -python ../vk-layer-generate.py generic ../include/vulkan/vulkan.h > generated/generic_layer.cpp -python ../vk-layer-generate.py api_dump ../include/vulkan/vulkan.h > generated/api_dump.cpp python ../vk-layer-generate.py object_tracker ../include/vulkan/vulkan.h > generated/object_tracker.cpp python ../vk-layer-generate.py threading ../include/vulkan/vulkan.h > generated/threading.cpp diff --git a/buildAndroid/jni/Android.mk b/buildAndroid/jni/Android.mk index df2809a0..de3a5dcd 100644 --- a/buildAndroid/jni/Android.mk +++ b/buildAndroid/jni/Android.mk @@ -27,17 +27,6 @@ LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
-LOCAL_MODULE := VkLayer_basic
-LOCAL_SRC_FILES += $(SRC_DIR)/layers/basic.cpp
-LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp
-LOCAL_C_INCLUDES += $(SRC_DIR)/include \
- $(SRC_DIR)/buildAndroid/generated
-LOCAL_STATIC_LIBRARIES += layer_utils
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-LOCAL_LDLIBS := -llog
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
LOCAL_MODULE := VkLayer_draw_state
LOCAL_SRC_FILES += $(SRC_DIR)/layers/draw_state.cpp
LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_debug_marker_table.cpp
@@ -102,32 +91,6 @@ LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
-LOCAL_MODULE := VkLayer_generic
-LOCAL_SRC_FILES += $(SRC_DIR)/buildAndroid/generated/generic_layer.cpp
-LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp
-LOCAL_C_INCLUDES += $(SRC_DIR)/include \
- $(SRC_DIR)/layers \
- $(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 := VkLayer_api_dump
-LOCAL_SRC_FILES += $(SRC_DIR)/buildAndroid/generated/api_dump.cpp
-LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp
-LOCAL_C_INCLUDES += $(SRC_DIR)/include \
- $(SRC_DIR)/layers \
- $(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 := VkLayer_object_tracker
LOCAL_SRC_FILES += $(SRC_DIR)/buildAndroid/generated/object_tracker.cpp
LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp
diff --git a/buildAndroid/jni/Application.mk b/buildAndroid/jni/Application.mk index 0fb770aa..76af9d18 100644 --- a/buildAndroid/jni/Application.mk +++ b/buildAndroid/jni/Application.mk @@ -16,6 +16,6 @@ APP_ABI := armeabi-v7a arm64-v8a x86 x86_64 mips mips64
APP_PLATFORM := android-22
APP_STL := gnustl_static
-APP_MODULES := layer_utils VkLayer_basic VkLayer_draw_state VkLayer_mem_tracker VkLayer_device_limits VkLayer_image VkLayer_param_checker VkLayer_generic VkLayer_api_dump VkLayer_object_tracker VkLayer_threading VkLayerValidationTests
+APP_MODULES := layer_utils VkLayer_draw_state VkLayer_mem_tracker VkLayer_device_limits VkLayer_image VkLayer_param_checker VkLayer_object_tracker VkLayer_threading VkLayerValidationTests
APP_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES
NDK_TOOLCHAIN_VERSION := 4.8
|