diff options
| author | Ted Bauer <tedbauer@google.com> | 2024-04-30 01:20:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-30 01:20:21 +0000 |
| commit | ced25ac6303cde66b16844c6aec79976f44d1c53 (patch) | |
| tree | 2179d638cac63dde276ddb15166bfbf51f6c9081 | |
| parent | 15967616cad50f3bee007c2bf420e8dba6c94ebb (diff) | |
| parent | d724dd04e2f2d12a60ecb9c11375232295f29d7f (diff) | |
| download | build-ced25ac6303cde66b16844c6aec79976f44d1c53.tar.gz | |
Merge "Add cc_defaults containing libs needed for static linking" into main
| -rw-r--r-- | tools/aconfig/aconfig/templates/cpp_source_file.template | 1 | ||||
| -rw-r--r-- | tools/aconfig/aconfig_storage_read_api/Android.bp | 8 |
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", + ], +} |