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

Switch to static deps

Browse Source 
Bug: 328444881
Test: m
Change-Id: I53ad95ca281031ec98d5df66ada0ed69749da312
This commit is contained in:
Ted Bauer
2024-04-25 19:50:01 +00:00
parent b39c877ae0
commit 1e96f8c622
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
aconfig/codegen/cc_aconfig_library.go
View File

@@ -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
apex/aconfig_test.go
View File

@@ -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
apex/apex_test.go
View File

@@ -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",