diff options
| author | Michael Lentine <mlentine@google.com> | 2015-12-09 14:33:52 -0800 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2015-12-11 15:32:58 -0700 |
| commit | 1665af28d4f7804475621b009d34bd698a814149 (patch) | |
| tree | 8bd57ab8df5e4627eec6f7e0c4dd3d950f4ab8ef | |
| parent | 79d02b3fcf94bb232937de3eb69e722f584e45c1 (diff) | |
| download | usermoji-1665af28d4f7804475621b009d34bd698a814149.tar.xz | |
android: Update build to define android platform at build time
| -rw-r--r-- | buildAndroid/jni/Android.mk | 11 | ||||
| -rw-r--r-- | include/vulkan/vk_layer.h | 12 |
2 files changed, 11 insertions, 12 deletions
diff --git a/buildAndroid/jni/Android.mk b/buildAndroid/jni/Android.mk index 186c4c10..7a788248 100644 --- a/buildAndroid/jni/Android.mk +++ b/buildAndroid/jni/Android.mk @@ -22,6 +22,7 @@ LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_config.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_extension_utils.cpp
LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_utils.cpp
LOCAL_C_INCLUDES += $(SRC_DIR)/include
+LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
LOCAL_LDLIBS := -llog
include $(BUILD_STATIC_LIBRARY)
@@ -32,6 +33,7 @@ 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)
@@ -44,6 +46,7 @@ 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)
@@ -55,6 +58,7 @@ 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)
@@ -66,6 +70,7 @@ 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)
@@ -78,6 +83,7 @@ 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)
@@ -90,6 +96,7 @@ 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)
@@ -102,6 +109,7 @@ 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)
@@ -114,6 +122,7 @@ 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)
@@ -126,6 +135,7 @@ 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)
@@ -140,6 +150,7 @@ LOCAL_C_INCLUDES += $(SRC_DIR)/include \ $(SRC_DIR)/libs \
$(SRC_DIR)/icd/common
LOCAL_STATIC_LIBRARIES := googletest_main layer_utils
+LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
LOCAL_LDLIBS := -lvulkan
include $(BUILD_EXECUTABLE)
diff --git a/include/vulkan/vk_layer.h b/include/vulkan/vk_layer.h index 31040c0e..47165f77 100644 --- a/include/vulkan/vk_layer.h +++ b/include/vulkan/vk_layer.h @@ -14,18 +14,6 @@ #else # define VK_LAYER_EXPORT #endif -#if defined(__ANDROID__) -#define VK_USE_PLATFORM_ANDROID_KHR -#elif defined(_WIN32) -#define VK_USE_PLATFORM_WIN32_KHR -#elif defined(__unix__) -#define VK_USE_PLATFORM_MIR_KHR -#define VK_USE_PLATFORM_WAYLAND_KHR -#define VK_USE_PLATFORM_XLIB_KHR -#define VK_USE_PLATFORM_XCB_KHR -#else -#error "Unsupported Platform!" -#endif typedef void * (VKAPI_PTR *PFN_vkGPA)(void* obj, const char * pName); typedef struct VkBaseLayerObject_ |