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

Soong: remove libbase dependency

Browse Source 
The updated API lib no longer depends on libbase, thus the aconfig flag lib does not need to depend on libbase either.

Bug: b/321077378
Test: m and avd
Ignore-AOSP-First: will fix any incompatibilities caused by this change in git main first, and then cherry pick it back to aosp

Change-Id: Ib27ee15e1f3a983686fde6bbf6c9df9afa4781eb
This commit is contained in:
Dennis Shen
2024-06-06 13:51:00 +00:00
committed by Ted Bauer
parent 68bea7c213
commit 7c20f4bae2
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
aconfig/codegen/cc_aconfig_library.go
View File

@@ -34,7 +34,6 @@ var ccDeclarationsTag = ccDeclarationsTagType{}
const baseLibDep = "server_configurable_flags" const baseLibDep = "server_configurable_flags"
const libBaseDep = "libbase"
const libLogDep = "liblog" const libLogDep = "liblog"
const libAconfigStorageReadApiCcDep = "libaconfig_storage_read_api_cc" const libAconfigStorageReadApiCcDep = "libaconfig_storage_read_api_cc"
@@ -87,13 +86,9 @@ 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 // Add a dependency for the aconfig flags base library if it is not forced read only
if mode != "force-read-only" { if mode != "force-read-only" {
deps.SharedLibs = append(deps.SharedLibs, baseLibDep) deps.SharedLibs = append(deps.SharedLibs, baseLibDep)
}
// TODO: after storage migration is over, don't add these in force-read-only-mode.
deps.SharedLibs = append(deps.SharedLibs, libAconfigStorageReadApiCcDep) deps.SharedLibs = append(deps.SharedLibs, libAconfigStorageReadApiCcDep)
deps.SharedLibs = append(deps.SharedLibs, libBaseDep)
deps.SharedLibs = append(deps.SharedLibs, libLogDep) deps.SharedLibs = append(deps.SharedLibs, libLogDep)
}
// TODO: It'd be really nice if we could reexport this library and not make everyone do it. // TODO: It'd be really nice if we could reexport this library and not make everyone do it.