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

Merge "Add new storage deps in forced read-only mode" into main am: 82e91a602b am: e6dae288ae

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

Change-Id: I48a7f64b42bd8be4cd55617703dd264e9dc6afb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-05-01 15:51:17 +00:00
committed by Automerger Merge Worker
parent 6e97b79a68 e6dae288ae
commit be43654c4e
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
aconfig/codegen/cc_aconfig_library.go
View File

@@ -88,10 +88,13 @@ func (this *CcAconfigLibraryCallbacks) GeneratorDeps(ctx cc.DepsContext, deps cc
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)
deps.SharedLibs = append(deps.SharedLibs, libBaseDep)
} }
// 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

16
aconfig/codegen/cc_aconfig_library_test.go
View File

@@ -253,6 +253,22 @@ func TestForceReadOnly(t *testing.T) {
aconfig_declarations: "my_aconfig_declarations", aconfig_declarations: "my_aconfig_declarations",
mode: "force-read-only", mode: "force-read-only",
} }
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"],
}
`)) `))
module := result.ModuleForTests("my_cc_aconfig_library", "android_arm64_armv8-a_shared").Module() module := result.ModuleForTests("my_cc_aconfig_library", "android_arm64_armv8-a_shared").Module()