aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Bauer <tedbauer@google.com>2024-04-29 19:59:30 +0000
committerTed Bauer <tedbauer@google.com>2024-04-29 23:41:52 +0000
commitd724dd04e2f2d12a60ecb9c11375232295f29d7f (patch)
treeaeda7b6aa0c06c7aeb61280478963ab4f5637353
parentfaeac4d7f7e0906c03de11e10130a23126381834 (diff)
downloadbuild-d724dd04e2f2d12a60ecb9c11375232295f29d7f.tar.gz
Add cc_defaults containing libs needed for static linking
Bug: 328444881 Test: m Change-Id: I35cbce94301415381b3ad38d7e5c697f9c010856
-rw-r--r--tools/aconfig/aconfig/templates/cpp_source_file.template1
-rw-r--r--tools/aconfig/aconfig_storage_read_api/Android.bp8
2 files changed, 8 insertions, 1 deletions
diff --git a/tools/aconfig/aconfig/templates/cpp_source_file.template b/tools/aconfig/aconfig/templates/cpp_source_file.template
index 7646015af9..62664bc566 100644
--- a/tools/aconfig/aconfig/templates/cpp_source_file.template
+++ b/tools/aconfig/aconfig/templates/cpp_source_file.template
@@ -3,7 +3,6 @@
{{ if allow_instrumentation }}
#include <sys/stat.h>
#include "aconfig_storage/aconfig_storage_read_api.hpp"
-#include <protos/aconfig_storage_metadata.pb.h>
#include <android/log.h>
#define ALOGI(msg, ...) \
diff --git a/tools/aconfig/aconfig_storage_read_api/Android.bp b/tools/aconfig/aconfig_storage_read_api/Android.bp
index c89107fddd..217104b6b2 100644
--- a/tools/aconfig/aconfig_storage_read_api/Android.bp
+++ b/tools/aconfig/aconfig_storage_read_api/Android.bp
@@ -109,3 +109,11 @@ cc_library {
},
double_loadable: true,
}
+
+cc_defaults {
+ name: "aconfig_lib_cc_static_link.defaults",
+ shared_libs: [
+ "libaconfig_storage_read_api_cc",
+ "liblog",
+ ],
+}