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

Revert "Soong: remove libbase dependency"

Browse Source 
Revert submission 27712511-codegen_cpp

Reason for revert: Droidmonitor created revert due to test breakages in b/349597124.

Reverted changes: /q/submissionid:27712511-codegen_cpp

Change-Id: I98a9aa8e9e73b0d58c3f02502edf90cfac761c35
This commit is contained in:
Priyanka Advani
2024-06-26 16:19:27 +00:00
committed by Android (Google) Code Review
parent 7c20f4bae2
commit 10ec179d28
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
aconfig/codegen/cc_aconfig_library.go
View File

@@ -34,6 +34,7 @@ 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"
@@ -86,10 +87,14 @@ 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)
deps.SharedLibs = append(deps.SharedLibs, libAconfigStorageReadApiCcDep)
deps.SharedLibs = append(deps.SharedLibs, libLogDep)
} }
// 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, libBaseDep)
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.
return deps return deps