StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cc_cmake_snapshot: refine link and compile flags

Browse Source 
Also, move some AIDL detection logic to the AIDL library extension

Bug: 341997808
Test: m binder_sdk
Change-Id: I7776d2a967f547b305b0fa3a68dbe8cba5111534
This commit is contained in:
Tomasz Wasilczyk
2024-06-25 10:30:30 -07:00
parent dd274aba5f
commit cd674738c0
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cc/cmake_ext_add_aidl_library.txt
View File

@@ -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) function(add_aidl_library NAME LANG AIDLROOT SOURCES AIDLFLAGS)
if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.20") if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.20")
cmake_policy(SET CMP0116 NEW) cmake_policy(SET CMP0116 NEW)

11
cc/cmake_main.txt
View File

@@ -6,20 +6,12 @@ enable_testing()
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
include(AddAidlLibrary) include(AddAidlLibrary)
include(AppendCxxFlagsIfSupported) include(AppendCxxFlagsIfSupported)
include(FindThreads)
if (NOT ANDROID_BUILD_TOP) if (NOT ANDROID_BUILD_TOP)
set(ANDROID_BUILD_TOP "${CMAKE_CURRENT_SOURCE_DIR}") set(ANDROID_BUILD_TOP "${CMAKE_CURRENT_SOURCE_DIR}")
endif() 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()
<<cflagsList .M.Name "_CFLAGS" .M.Properties.Cflags .M.Properties.Unportable_flags .M.Properties.Cflags_ignored>> <<cflagsList .M.Name "_CFLAGS" .M.Properties.Cflags .M.Properties.Unportable_flags .M.Properties.Cflags_ignored>>
<<range .Pprop.SystemPackages ->> <<range .Pprop.SystemPackages ->>
@@ -29,6 +21,7 @@ find_package(<<.>> REQUIRED)
add_subdirectory("${ANDROID_BUILD_TOP}/<<.>>" "<<.>>/build" EXCLUDE_FROM_ALL) add_subdirectory("${ANDROID_BUILD_TOP}/<<.>>" "<<.>>/build" EXCLUDE_FROM_ALL)
<<end>> <<end>>
add_compile_options(${<<.M.Name>>_CFLAGS}) add_compile_options(${<<.M.Name>>_CFLAGS})
link_libraries(${CMAKE_THREAD_LIBS_INIT})
<<range $moduleDir, $value := .ModuleDirs ->> <<range $moduleDir, $value := .ModuleDirs ->>
add_subdirectory(<<$moduleDir>>) add_subdirectory(<<$moduleDir>>)
<<end>> <<end>>

2
cc/cmake_snapshot.go
View File

@@ -51,8 +51,10 @@ var cmakeExtAddAidlLibrary string
var cmakeExtAppendFlags string var cmakeExtAppendFlags string
var defaultUnportableFlags []string = []string{ var defaultUnportableFlags []string = []string{
"-Wno-c99-designator",
"-Wno-class-memaccess", "-Wno-class-memaccess",
"-Wno-exit-time-destructors", "-Wno-exit-time-destructors",
"-Winconsistent-missing-override",
"-Wno-inconsistent-missing-override", "-Wno-inconsistent-missing-override",
"-Wreorder-init-list", "-Wreorder-init-list",
"-Wno-reorder-init-list", "-Wno-reorder-init-list",