diff options
| author | Yilong Li <liyl@google.com> | 2021-11-17 15:00:24 -0800 |
|---|---|---|
| committer | Yilong Li <liyl@google.com> | 2021-11-17 15:12:11 -0800 |
| commit | bf3a758d2eddea05ede5163fa8aa8f8e1ab4df44 (patch) | |
| tree | 1e8df169ef9e12e79695e8d2031090f3c63bd075 | |
| parent | 983110f374a7aa02180bb9fc86865538ba598fee (diff) | |
| download | gfxstream-protocols-bf3a758d2eddea05ede5163fa8aa8f8e1ab4df44.tar.gz | |
Revert "Revert "cmake: Remove architecture specifiers for some compiler ...""
This reverts commit 93d50a7b8bbdbf024ef23e42ac234813c337eff0.
Many compile definitions and compile settings are architecture
agnostic and there is no need to define them once for each
architecture. Instead we can just use the OS name to differentiate
them from each other.
This change modifies the android_target_*() cmake logic,
allowing two new target names "linux" and "darwin" which
could match any Linux / macOS target regardless of architecture.
This makes our CMakeLists.txt files less verbose.
Bug: b/206641310
Original-Change-Id: I85d03d2a6ddb8ec78f55e882081f9b7966a09de6
Change-Id: I5e317fcd580b6a687ebb70a2a5f8848cdb7fcb8e
| -rw-r--r-- | registry/vulkan/xml/cerealgenerator.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/registry/vulkan/xml/cerealgenerator.py b/registry/vulkan/xml/cerealgenerator.py index 12f227b8..555e0ec1 100644 --- a/registry/vulkan/xml/cerealgenerator.py +++ b/registry/vulkan/xml/cerealgenerator.py @@ -128,10 +128,8 @@ android_add_library(TARGET OpenglRender_vulkan_cereal_dispatch LICENSE Apache-2. ) target_compile_definitions(OpenglRender_vulkan_cereal_dispatch PRIVATE -DVK_ANDROID_native_buffer -DVK_GOOGLE_gfxstream) android_target_compile_definitions(OpenglRender_vulkan_cereal_dispatch windows PRIVATE -DVK_USE_PLATFORM_WIN32_KHR) -android_target_compile_definitions(OpenglRender_vulkan_cereal_dispatch linux-x86_64 PRIVATE -DVK_USE_PLATFORM_XCB_KHR) -android_target_compile_definitions(OpenglRender_vulkan_cereal_dispatch linux-aarch64 PRIVATE -DVK_USE_PLATFORM_XCB_KHR) -android_target_compile_definitions(OpenglRender_vulkan_cereal_dispatch darwin-x86_64 PRIVATE -DVK_USE_PLATFORM_METAL_EXT) -android_target_compile_definitions(OpenglRender_vulkan_cereal_dispatch darwin-aarch64 PRIVATE -DVK_USE_PLATFORM_METAL_EXT) +android_target_compile_definitions(OpenglRender_vulkan_cereal_dispatch linux PRIVATE -DVK_USE_PLATFORM_XCB_KHR) +android_target_compile_definitions(OpenglRender_vulkan_cereal_dispatch darwin PRIVATE -DVK_USE_PLATFORM_METAL_EXT) target_include_directories(OpenglRender_vulkan_cereal_dispatch PUBLIC ${ANDROID_EMUGL_DIR}/host/libs/libOpenglRender/vulkan/cereal |