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

Merge "Add aconfig storage API deps to codegened lib" into main am: b39c877ae0 am: e7b8b02428

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3055467

Change-Id: I7e2663716723adf47224445f714a36147a82fe82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ted Bauer
2024-04-23 23:27:16 +00:00
committed by Automerger Merge Worker
parent eb094df68e e7b8b02428
commit 7a6d4f75d8
4 changed files with 123 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
aconfig/codegen/cc_aconfig_library.go
View File

@@ -33,6 +33,11 @@ var ccDeclarationsTag = ccDeclarationsTagType{}
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
Aconfig_declarations string
@@ -82,6 +87,11 @@ func (this *CcAconfigLibraryCallbacks) GeneratorDeps(ctx cc.DepsContext, deps cc
// Add a dependency for the aconfig flags base library if it is not forced read only
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)
}
// TODO: It'd be really nice if we could reexport this library and not make everyone do it.

65
aconfig/codegen/cc_aconfig_library_test.go
View File

@@ -58,6 +58,26 @@ func testCCCodegenModeHelper(t *testing.T, bpMode string, ruleMode string) {
srcs: ["server_configurable_flags.cc"],
}
cc_library {
name: "libbase",
srcs: ["libbase.cc"],
}
cc_library {
name: "liblog",
srcs: ["liblog.cc"],
}
cc_library {
name: "libaconfig_storage_read_api_cc",
srcs: ["libaconfig_storage_read_api_cc.cc"],
}
cc_library {
name: "libaconfig_storage_protos_cc",
srcs: ["libaconfig_storage_protos_cc.cc"],
}
cc_aconfig_library {
name: "my_cc_aconfig_library",
aconfig_declarations: "my_aconfig_declarations",
@@ -100,6 +120,27 @@ func testIncorrectCCCodegenModeHelper(t *testing.T, bpMode string, err string) {
srcs: ["server_configurable_flags.cc"],
}
cc_library {
name: "libbase",
srcs: ["libbase.cc"],
}
cc_library {
name: "liblog",
srcs: ["liblog.cc"],
}
cc_library {
name: "libaconfig_storage_read_api_cc",
srcs: ["libaconfig_storage_read_api_cc.cc"],
}
cc_library {
name: "libaconfig_storage_protos_cc",
srcs: ["libaconfig_storage_protos_cc.cc"],
}
cc_aconfig_library {
name: "my_cc_aconfig_library",
aconfig_declarations: "my_aconfig_declarations",
@@ -152,6 +193,30 @@ func TestAndroidMkCcLibrary(t *testing.T) {
srcs: ["server_configurable_flags.cc"],
vendor_available: true,
}
cc_library {
name: "libbase",
srcs: ["libbase.cc"],
vendor_available: true,
}
cc_library {
name: "liblog",
srcs: ["liblog.cc"],
vendor_available: true,
}
cc_library {
name: "libaconfig_storage_read_api_cc",
srcs: ["libaconfig_storage_read_api_cc.cc"],
vendor_available: true,
}
cc_library {
name: "libaconfig_storage_protos_cc",
srcs: ["libaconfig_storage_protos_cc.cc"],
vendor_available: true,
}
`
result := android.GroupFixturePreparers(
PrepareForTestWithAconfigBuildComponents,

36
apex/aconfig_test.go
View File

@@ -162,6 +162,18 @@ func TestValidationAcrossContainersExportedPass(t *testing.T) {
name: "server_configurable_flags",
srcs: ["server_configurable_flags.cc"],
}
cc_library {
name: "libbase",
srcs: ["libbase.cc"],
}
cc_library {
name: "libaconfig_storage_read_api_cc",
srcs: ["libaconfig_storage_read_api_cc.cc"],
}
cc_library {
name: "libaconfig_storage_protos_cc",
srcs: ["libaconfig_storage_protos_cc.cc"],
}
aconfig_declarations {
name: "my_aconfig_declarations_bar",
package: "com.example.package",
@@ -410,6 +422,18 @@ func TestValidationAcrossContainersNotExportedFail(t *testing.T) {
name: "server_configurable_flags",
srcs: ["server_configurable_flags.cc"],
}
cc_library {
name: "libbase",
srcs: ["libbase.cc"],
}
cc_library {
name: "libaconfig_storage_read_api_cc",
srcs: ["libaconfig_storage_read_api_cc.cc"],
}
cc_library {
name: "libaconfig_storage_protos_cc",
srcs: ["libaconfig_storage_protos_cc.cc"],
}
aconfig_declarations {
name: "my_aconfig_declarations_foo",
package: "com.example.package",
@@ -460,6 +484,18 @@ func TestValidationAcrossContainersNotExportedFail(t *testing.T) {
name: "server_configurable_flags",
srcs: ["server_configurable_flags.cc"],
}
cc_library {
name: "libbase",
srcs: ["libbase.cc"],
}
cc_library {
name: "libaconfig_storage_read_api_cc",
srcs: ["libaconfig_storage_read_api_cc.cc"],
}
cc_library {
name: "libaconfig_storage_protos_cc",
srcs: ["libaconfig_storage_protos_cc.cc"],
}
aconfig_declarations {
name: "my_aconfig_declarations_foo",
package: "com.example.package",

12
apex/apex_test.go
View File

@@ -10699,6 +10699,18 @@ func TestAconfigFilesJavaAndCcDeps(t *testing.T) {
name: "server_configurable_flags",
srcs: ["server_configurable_flags.cc"],
}
cc_library {
name: "libbase",
srcs: ["libbase.cc"],
}
cc_library {
name: "libaconfig_storage_read_api_cc",
srcs: ["libaconfig_storage_read_api_cc.cc"],
}
cc_library {
name: "libaconfig_storage_protos_cc",
srcs: ["libaconfig_storage_protos_cc.cc"],
}
`)
mod := ctx.ModuleForTests("myapex", "android_common_myapex")