diff options
| author | 2024-04-25 19:50:01 +0000 | |
|---|---|---|
| committer | 2024-04-26 13:46:09 +0000 | |
| commit | 1e96f8c622cb4dd3332f5859e3178cce0a37f916 (patch) | |
| tree | 85e440cc53852f3e3408141279bed7aca415f589 | |
| parent | b39c877ae058b6217f416783453b7433fd969494 (diff) | |
Switch to static deps
Bug: 328444881
Test: m
Change-Id: I53ad95ca281031ec98d5df66ada0ed69749da312
| -rw-r--r-- | aconfig/codegen/cc_aconfig_library.go | 7 | ||||
| -rw-r--r-- | apex/aconfig_test.go | 9 | ||||
| -rw-r--r-- | apex/apex_test.go | 3 |
3 files changed, 15 insertions, 4 deletions
diff --git a/aconfig/codegen/cc_aconfig_library.go b/aconfig/codegen/cc_aconfig_library.go index 2d3ee39f9..d5291fce9 100644 --- a/aconfig/codegen/cc_aconfig_library.go +++ b/aconfig/codegen/cc_aconfig_library.go @@ -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. diff --git a/apex/aconfig_test.go b/apex/aconfig_test.go index 3de928633..726041c60 100644 --- a/apex/aconfig_test.go +++ b/apex/aconfig_test.go @@ -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", diff --git a/apex/apex_test.go b/apex/apex_test.go index 8a3735cbe..3e284b186 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -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", |