From f665c390ee3958016e130ed2080f6769921b3bb0 Mon Sep 17 00:00:00 2001 From: Cody Northrop Date: Mon, 6 Nov 2017 13:54:42 -0700 Subject: [PATCH] android: Remove mips targets --- build-android/jni/Android.mk | 20 ++++++++++---------- build-android/jni/Application.mk | 2 +- demos/android/jni/Application.mk | 2 +- icd/CMakeLists.txt | 6 ------ layers/CMakeLists.txt | 6 ------ 5 files changed, 12 insertions(+), 24 deletions(-) diff --git a/build-android/jni/Android.mk b/build-android/jni/Android.mk index f9d47ba..45c8006 100644 --- a/build-android/jni/Android.mk +++ b/build-android/jni/Android.mk @@ -27,7 +27,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \ $(LOCAL_PATH)/$(LAYER_DIR)/include \ $(LOCAL_PATH)/$(SRC_DIR)/layers \ $(LOCAL_PATH)/$(SRC_DIR)/loader -LOCAL_CPPFLAGS += -std=c++11 -Wall -Werror -Wno-unused-function -Wno-unused-const-variable -mxgot +LOCAL_CPPFLAGS += -std=c++11 -Wall -Werror -Wno-unused-function -Wno-unused-const-variable LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -DVK_PROTOTYPES -fvisibility=hidden include $(BUILD_STATIC_LIBRARY) @@ -43,7 +43,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \ $(LOCAL_PATH)/$(LAYER_DIR)/include \ $(LOCAL_PATH)/$(SRC_DIR)/loader LOCAL_STATIC_LIBRARIES += layer_utils glslang SPIRV-Tools -LOCAL_CPPFLAGS += -std=c++11 -Wall -Werror -Wno-unused-function -Wno-unused-const-variable -mxgot +LOCAL_CPPFLAGS += -std=c++11 -Wall -Werror -Wno-unused-function -Wno-unused-const-variable LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -DVK_PROTOTYPES -fvisibility=hidden LOCAL_LDLIBS := -llog LOCAL_LDFLAGS += -Wl,-Bsymbolic @@ -60,7 +60,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \ $(LOCAL_PATH)/$(SRC_DIR)/layers \ $(LOCAL_PATH)/$(SRC_DIR)/loader LOCAL_STATIC_LIBRARIES += layer_utils -LOCAL_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable -mxgot +LOCAL_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -fvisibility=hidden LOCAL_LDLIBS := -llog LOCAL_LDFLAGS += -Wl,-Bsymbolic @@ -77,7 +77,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \ $(LOCAL_PATH)/$(LAYER_DIR)/include \ $(LOCAL_PATH)/$(SRC_DIR)/loader LOCAL_STATIC_LIBRARIES += layer_utils -LOCAL_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable -mxgot +LOCAL_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -fvisibility=hidden LOCAL_LDLIBS := -llog LOCAL_LDFLAGS += -Wl,-Bsymbolic @@ -93,7 +93,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \ $(LOCAL_PATH)/$(LAYER_DIR)/include \ $(LOCAL_PATH)/$(SRC_DIR)/loader LOCAL_STATIC_LIBRARIES += layer_utils -LOCAL_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable -mxgot +LOCAL_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -fvisibility=hidden LOCAL_LDLIBS := -llog LOCAL_LDFLAGS += -Wl,-Bsymbolic @@ -109,7 +109,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \ $(LOCAL_PATH)/$(LAYER_DIR)/include \ $(LOCAL_PATH)/$(SRC_DIR)/loader LOCAL_STATIC_LIBRARIES += layer_utils -LOCAL_CPPFLAGS += -std=c++11 -Wall -Werror -Wno-unused-function -Wno-unused-const-variable -mxgot +LOCAL_CPPFLAGS += -std=c++11 -Wall -Werror -Wno-unused-function -Wno-unused-const-variable LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -DVK_PROTOTYPES -fvisibility=hidden LOCAL_LDLIBS := -llog LOCAL_LDFLAGS += -Wl,-Bsymbolic @@ -130,7 +130,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \ $(LOCAL_PATH)/$(SRC_DIR)/common LOCAL_STATIC_LIBRARIES := googletest_main layer_utils shaderc -LOCAL_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable -mxgot +LOCAL_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -fvisibility=hidden --include=$(SRC_DIR)/common/vulkan_wrapper.h LOCAL_LDLIBS := -llog LOCAL_LDFLAGS += -Wl,-Bsymbolic @@ -152,7 +152,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \ $(LOCAL_PATH)/$(SRC_DIR)/common LOCAL_STATIC_LIBRARIES := googletest_main layer_utils shaderc -LOCAL_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable -mxgot +LOCAL_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -fvisibility=hidden -DVALIDATION_APK --include=$(SRC_DIR)/common/vulkan_wrapper.h LOCAL_WHOLE_STATIC_LIBRARIES += android_native_app_glue LOCAL_LDLIBS := -llog -landroid @@ -168,7 +168,7 @@ LOCAL_SRC_FILES += $(SRC_DIR)/libs/vkjson/vkjson.cc \ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \ $(LOCAL_PATH)/$(SRC_DIR)/loader -LOCAL_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable -mxgot +LOCAL_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -fvisibility=hidden --include=$(SRC_DIR)/common/vulkan_wrapper.h include $(BUILD_STATIC_LIBRARY) @@ -180,7 +180,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/loader \ $(LOCAL_PATH)/$(SRC_DIR)/include LOCAL_STATIC_LIBRARIES += vkjson -LOCAL_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable -mxgot +LOCAL_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable LOCAL_CPPFLAGS += -Wno-sign-compare -DVK_USE_PLATFORM_ANDROID_KHR --include=$(SRC_DIR)/common/vulkan_wrapper.h LOCAL_LDLIBS := -llog LOCAL_LDFLAGS += -Wl,--exclude-libs,ALL diff --git a/build-android/jni/Application.mk b/build-android/jni/Application.mk index c83044e..c50afc5 100644 --- a/build-android/jni/Application.mk +++ b/build-android/jni/Application.mk @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -APP_ABI := armeabi-v7a arm64-v8a x86 x86_64 mips mips64 +APP_ABI := armeabi-v7a arm64-v8a x86 x86_64 APP_PLATFORM := android-22 APP_STL := gnustl_static APP_MODULES := layer_utils VkLayer_core_validation VkLayer_parameter_validation VkLayer_object_tracker VkLayer_threading VkLayer_unique_objects VkLayerValidationTests VulkanLayerValidationTests vkjson_info diff --git a/demos/android/jni/Application.mk b/demos/android/jni/Application.mk index 389507c..e215f21 100644 --- a/demos/android/jni/Application.mk +++ b/demos/android/jni/Application.mk @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -APP_ABI := armeabi-v7a arm64-v8a x86 x86_64 mips mips64 +APP_ABI := armeabi-v7a arm64-v8a x86 x86_64 APP_PLATFORM := android-23 APP_STL := gnustl_static APP_MODULES := Cube diff --git a/icd/CMakeLists.txt b/icd/CMakeLists.txt index 6216268..a83d702 100644 --- a/icd/CMakeLists.txt +++ b/icd/CMakeLists.txt @@ -135,12 +135,6 @@ else() set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpointer-arith -Wno-unused-function -Wno-sign-compare") endif() -if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "mips64") - if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") - set_source_files_properties(mock_icd.cpp PROPERTIES COMPILE_FLAGS -mxgot) - endif() -endif() - run_vk_xml_generate(mock_icd_generator.py mock_icd.h) run_vk_xml_generate(mock_icd_generator.py mock_icd.cpp) diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt index 9567d71..f9f1333 100644 --- a/layers/CMakeLists.txt +++ b/layers/CMakeLists.txt @@ -159,12 +159,6 @@ else() set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpointer-arith -Wno-unused-function -Wno-sign-compare") endif() -if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "mips64") - if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") - set_source_files_properties(core_validation.cpp PROPERTIES COMPILE_FLAGS -mxgot) - endif() -endif() - run_vk_xml_generate(threading_generator.py thread_check.h) run_vk_xml_generate(parameter_validation_generator.py parameter_validation.cpp) run_vk_xml_generate(unique_objects_generator.py unique_objects_wrappers.h) -- 2.7.4