From 1665af28d4f7804475621b009d34bd698a814149 Mon Sep 17 00:00:00 2001 From: Michael Lentine Date: Wed, 9 Dec 2015 14:33:52 -0800 Subject: android: Update build to define android platform at build time --- buildAndroid/jni/Android.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'buildAndroid') 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) -- cgit v1.2.3