tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Switch to static deps" into main am: 8e4060abc5 am: 60462974fa

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

Change-Id: Ie69b7b4b5d1ed79d1c327a3765dfa94815da7cb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ted Bauer 2024-04-26 15:47:44 +00:00 committed by Automerger Merge Worker
commit f08e6ff54c
3 changed files with 15 additions and 4 deletions
Show stats 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

@ -10702,6 +10702,9 @@ func TestAconfigFilesJavaAndCcDeps(t *testing.T) {
cc_library {
name: "libbase",
srcs: ["libbase.cc"],
apex_available: [
"myapex",
],
}
cc_library {
name: "libaconfig_storage_read_api_cc",