diff options
| author | Tobin Ehlis <tobine@google.com> | 2016-04-28 09:00:47 -0600 |
|---|---|---|
| committer | Tobin Ehlis <tobine@google.com> | 2016-04-28 14:01:42 -0600 |
| commit | c1c78e77d7499814d662679bb83f668d4938c498 (patch) | |
| tree | 0c06d22cf666eff534f7a570c067e0def72ed216 /build-android | |
| parent | f18b241875d0cdbd45377a2c379bbe829454abae (diff) | |
android: Move vulkan_wrapper to common (from Cody)
Diffstat (limited to 'build-android')
| -rw-r--r-- | build-android/jni/Android.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/build-android/jni/Android.mk b/build-android/jni/Android.mk index f2fef9ff..49cb9f48 100644 --- a/build-android/jni/Android.mk +++ b/build-android/jni/Android.mk @@ -183,16 +183,17 @@ LOCAL_SRC_FILES += $(SRC_DIR)/tests/layer_validation_tests.cpp \ $(SRC_DIR)/tests/vktestbinding.cpp \ $(SRC_DIR)/tests/vktestframeworkandroid.cpp \ $(SRC_DIR)/tests/vkrenderframework.cpp \ - $(SRC_DIR)/tests/vulkan_wrapper.cpp + $(SRC_DIR)/common/vulkan_wrapper.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ $(SRC_DIR)/layers \ $(SRC_DIR)/libs \ + $(SRC_DIR)/common \ $(SRC_DIR)/icd/common \ $(SRC_DIR)/../shaderc/libshaderc/include/ LOCAL_STATIC_LIBRARIES := googletest_main layer_utils LOCAL_SHARED_LIBRARIES += shaderc-prebuilt glslang-prebuilt OGLCompiler-prebuilt OSDependent-prebuilt HLSL-prebuilt shaderc_util-prebuilt SPIRV-prebuilt SPIRV-Tools-prebuilt -LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR --include=$(SRC_DIR)/tests/vulkan_wrapper.h +LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR --include=$(SRC_DIR)/common/vulkan_wrapper.h LOCAL_LDLIBS := -llog include $(BUILD_EXECUTABLE) |