Merge "Minor cc_cmake_snapshot touch-ups" into main (14a77d3a) · Commits · e / os / android_build_soong

cc/cmake_ext_add_aidl_library.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ function(add_aidl_library NAME LANG AIDLROOT SOURCES AIDLFLAGS)
		endif()

		set(DEPFILE_ARG)
		if (NOT ${CMAKE_GENERATOR} MATCHES "Unix Makefiles")
		if (NOT ${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
		set(DEPFILE_ARG DEPFILE "${GEN_SOURCE}.d")
		endif()

		@@ -57,7 +57,7 @@ function(add_aidl_library NAME LANG AIDLROOT SOURCES AIDLFLAGS)
		"${GEN_DIR}/include"
		)

		if (${LANG} MATCHES "ndk")
		if (${LANG} STREQUAL "ndk")
		set(BINDER_LIB_NAME "libbinder_ndk_sdk")
		else()
		set(BINDER_LIB_NAME "libbinder_sdk")

+5 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,11 @@ 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()

+10 −1

Original line number	Diff line number	Diff line
		@@ -62,8 +62,13 @@ var defaultUnportableFlags []string = []string{
		}

		var ignoredSystemLibs []string = []string{
		"crtbegin_dynamic",
		"crtend_android",
		"libc",
		"libc++",
		"libc++_static",
		"libdl",
		"libm",
		"prebuilt_libclang_rt.builtins",
		"prebuilt_libclang_rt.ubsan_minimal",
		}
		@@ -272,7 +277,11 @@ func (m *CmakeSnapshot) DepsMutator(ctx android.BottomUpMutatorContext) {
		{"arch", "x86_64"},
		}
		ctx.AddVariationDependencies(variations, cmakeSnapshotModuleTag, m.Properties.Modules...)
		ctx.AddVariationDependencies(variations, cmakeSnapshotPrebuiltTag, m.Properties.Prebuilts...)

		if len(m.Properties.Prebuilts) > 0 {
		prebuilts := append(m.Properties.Prebuilts, "libc++")
		ctx.AddVariationDependencies(variations, cmakeSnapshotPrebuiltTag, prebuilts...)
		}
		}

		func (m *CmakeSnapshot) GenerateAndroidBuildActions(ctx android.ModuleContext) {