Merge "Switch to static deps" into main (8e4060ab) · Commits · e / os / android_build_soong

aconfig/codegen/cc_aconfig_library.go

+3 −4

Original line number	Diff line number	Diff line
		@@ -36,7 +36,6 @@ const baseLibDep = "server_configurable_flags"
		const libBaseDep = "libbase"
		const libLogDep = "liblog"
		const libAconfigStorageReadApiCcDep = "libaconfig_storage_read_api_cc"
		const libAconfigStorageProtosCcDep = "libaconfig_storage_protos_cc"

		type CcAconfigLibraryProperties struct {
		// name of the aconfig_declarations module to generate a library for
		@@ -88,10 +87,10 @@ func (this *CcAconfigLibraryCallbacks) GeneratorDeps(ctx cc.DepsContext, deps cc
		if mode != "force-read-only" {
		deps.SharedLibs = append(deps.SharedLibs, baseLibDep)

		deps.SharedLibs = append(deps.SharedLibs, libBaseDep)
		deps.SharedLibs = append(deps.SharedLibs, libLogDep)
		deps.SharedLibs = append(deps.SharedLibs, libAconfigStorageReadApiCcDep)
		deps.SharedLibs = append(deps.SharedLibs, libAconfigStorageProtosCcDep)
		deps.SharedLibs = append(deps.SharedLibs, libLogDep)

		deps.StaticLibs = append(deps.StaticLibs, libBaseDep)
		}
		// TODO: It'd be really nice if we could reexport this library and not make everyone do it.

+9 −0

Original line number	Diff line number	Diff line
		@@ -165,6 +165,9 @@ func TestValidationAcrossContainersExportedPass(t *testing.T) {
		cc_library {
		name: "libbase",
		srcs: ["libbase.cc"],
		apex_available: [
		"myapex",
		],
		}
		cc_library {
		name: "libaconfig_storage_read_api_cc",
		@@ -425,6 +428,9 @@ func TestValidationAcrossContainersNotExportedFail(t *testing.T) {
		cc_library {
		name: "libbase",
		srcs: ["libbase.cc"],
		apex_available: [
		"myapex",
		],
		}
		cc_library {
		name: "libaconfig_storage_read_api_cc",
		@@ -487,6 +493,9 @@ func TestValidationAcrossContainersNotExportedFail(t *testing.T) {
		cc_library {
		name: "libbase",
		srcs: ["libbase.cc"],
		apex_available: [
		"myapex",
		],
		}
		cc_library {
		name: "libaconfig_storage_read_api_cc",

+3 −0

Original line number	Diff line number	Diff line
		@@ -10694,6 +10694,9 @@ func TestAconfigFilesJavaAndCcDeps(t *testing.T) {
		cc_library {
		name: "libbase",
		srcs: ["libbase.cc"],
		apex_available: [
		"myapex",
		],
		}
		cc_library {
		name: "libaconfig_storage_read_api_cc",