From cd674738c0d86499cc917dc90a6874b5753ee2c9 Mon Sep 17 00:00:00 2001 From: Tomasz Wasilczyk Date: Tue, 25 Jun 2024 10:30:30 -0700 Subject: [PATCH] cc_cmake_snapshot: refine link and compile flags Also, move some AIDL detection logic to the AIDL library extension Bug: 341997808 Test: m binder_sdk Change-Id: I7776d2a967f547b305b0fa3a68dbe8cba5111534 --- cc/cmake_ext_add_aidl_library.txt | 9 +++++++++ cc/cmake_main.txt | 11 ++--------- cc/cmake_snapshot.go | 2 ++ 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/cc/cmake_ext_add_aidl_library.txt b/cc/cmake_ext_add_aidl_library.txt index aa3235e30..d5c134e83 100644 --- a/cc/cmake_ext_add_aidl_library.txt +++ b/cc/cmake_ext_add_aidl_library.txt @@ -1,3 +1,12 @@ +if ("${CMAKE_HOST_SYSTEM_PROCESSOR}" MATCHES "^(arm|aarch)") + set(PREBUILTS_BIN_DIR "${CMAKE_CURRENT_SOURCE_DIR}/prebuilts/host/linux_musl-arm64/bin") +else() + set(PREBUILTS_BIN_DIR "${CMAKE_CURRENT_SOURCE_DIR}/prebuilts/host/linux-x86/bin") +endif() +if (NOT AIDL_BIN) + find_program(AIDL_BIN aidl REQUIRED HINTS "${PREBUILTS_BIN_DIR}") +endif() + function(add_aidl_library NAME LANG AIDLROOT SOURCES AIDLFLAGS) if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.20") cmake_policy(SET CMP0116 NEW) diff --git a/cc/cmake_main.txt b/cc/cmake_main.txt index f6e21a6c6..eeabf53e1 100644 --- a/cc/cmake_main.txt +++ b/cc/cmake_main.txt @@ -6,20 +6,12 @@ enable_testing() set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake") include(AddAidlLibrary) include(AppendCxxFlagsIfSupported) +include(FindThreads) if (NOT ANDROID_BUILD_TOP) set(ANDROID_BUILD_TOP "${CMAKE_CURRENT_SOURCE_DIR}") endif() -if ("${CMAKE_HOST_SYSTEM_PROCESSOR}" MATCHES "^(arm|aarch)") - set(PREBUILTS_BIN_DIR "${CMAKE_CURRENT_SOURCE_DIR}/prebuilts/host/linux_musl-arm64/bin") -else() - set(PREBUILTS_BIN_DIR "${CMAKE_CURRENT_SOURCE_DIR}/prebuilts/host/linux-x86/bin") -endif() -if (NOT AIDL_BIN) - find_program(AIDL_BIN aidl REQUIRED HINTS "${PREBUILTS_BIN_DIR}") -endif() - <> <> @@ -29,6 +21,7 @@ find_package(<<.>> REQUIRED) add_subdirectory("${ANDROID_BUILD_TOP}/<<.>>" "<<.>>/build" EXCLUDE_FROM_ALL) <> add_compile_options(${<<.M.Name>>_CFLAGS}) +link_libraries(${CMAKE_THREAD_LIBS_INIT}) <> add_subdirectory(<<$moduleDir>>) <> diff --git a/cc/cmake_snapshot.go b/cc/cmake_snapshot.go index a12250919..c1df0e941 100644 --- a/cc/cmake_snapshot.go +++ b/cc/cmake_snapshot.go @@ -51,8 +51,10 @@ var cmakeExtAddAidlLibrary string var cmakeExtAppendFlags string var defaultUnportableFlags []string = []string{ + "-Wno-c99-designator", "-Wno-class-memaccess", "-Wno-exit-time-destructors", + "-Winconsistent-missing-override", "-Wno-inconsistent-missing-override", "-Wreorder-init-list", "-Wno-reorder-init-list",