| commit | ef05b587741bb8ac5ad08059fb725c61a61cf8a8 | [log] [tgz] |
|---|---|---|
| author | Ted Bauer <tedbauer@google.com> | Mon Apr 29 17:10:03 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 29 17:10:03 2024 +0000 |
| tree | 83743f66fe325dc5b294ceffee97f03eb7ddfcf4 | |
| parent | 11f24228dbf5ff3b717e062e5628d33791cbcd5a [diff] | |
| parent | 84835f48ead9663b415cce6b674c9365a8ca4be8 [diff] |
Merge "Switch libbase to shared" into main am: 84835f48ea Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3065162 Change-Id: I1398d12be4a7334b2c280479ba246c333babc414 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/aconfig/codegen/cc_aconfig_library.go b/aconfig/codegen/cc_aconfig_library.go index d5291fc..8e516b4 100644 --- a/aconfig/codegen/cc_aconfig_library.go +++ b/aconfig/codegen/cc_aconfig_library.go
@@ -89,8 +89,7 @@ deps.SharedLibs = append(deps.SharedLibs, libAconfigStorageReadApiCcDep) deps.SharedLibs = append(deps.SharedLibs, libLogDep) - - deps.StaticLibs = append(deps.StaticLibs, libBaseDep) + deps.SharedLibs = append(deps.SharedLibs, libBaseDep) } // TODO: It'd be really nice if we could reexport this library and not make everyone do it.