diff options
| author | Martin Stjernholm <mast@google.com> | 2018-10-22 01:34:56 +0100 |
|---|---|---|
| committer | Martin Stjernholm <mast@google.com> | 2018-10-24 16:11:45 +0100 |
| commit | 53aec482aacc82e4f96932805c85c01a76ed086b (patch) | |
| tree | 380265de92fad0045feaffa5d9fed92eb425a298 /libnativebridge | |
| parent | 551efd11f7d31399a4a2c22cb19b2523be9c4d18 (diff) | |
| download | system_core-53aec482aacc82e4f96932805c85c01a76ed086b.tar.gz system_core-53aec482aacc82e4f96932805c85c01a76ed086b.tar.bz2 system_core-53aec482aacc82e4f96932805c85c01a76ed086b.zip | |
Remove unnecessary dynamic dependency on libbase.
This code only uses android-base/macros.h.
Bug: 118374951
Test: mmma system/core/libnativebridge && for f in out/host/linux-x86/nativetest{,64}/*/*; do $f; done
Change-Id: Ifa5a5a3c9370bd128ddd301ea352746699715929
Diffstat (limited to 'libnativebridge')
| -rw-r--r-- | libnativebridge/Android.bp | 4 | ||||
| -rw-r--r-- | libnativebridge/tests/Android.mk | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libnativebridge/Android.bp b/libnativebridge/Android.bp index 6e63b74c6..92fd2a2f5 100644 --- a/libnativebridge/Android.bp +++ b/libnativebridge/Android.bp @@ -10,9 +10,11 @@ cc_library { host_supported: true, srcs: ["native_bridge.cc"], + header_libs: [ + "libbase_headers", + ], shared_libs: [ "liblog", - "libbase", ], export_include_dirs: ["include"], diff --git a/libnativebridge/tests/Android.mk b/libnativebridge/tests/Android.mk index 5b9ba1cde..4ed6e20e6 100644 --- a/libnativebridge/tests/Android.mk +++ b/libnativebridge/tests/Android.mk @@ -29,10 +29,12 @@ test_src_files := \ shared_libraries := \ liblog \ - libbase \ libnativebridge \ libnativebridge-dummy +header_libraries := \ + libbase_headers + libnativebridge_tests_common_cflags := \ -Wall \ -Werror \ @@ -40,6 +42,7 @@ libnativebridge_tests_common_cflags := \ $(foreach file,$(test_src_files), \ $(eval include $(CLEAR_VARS)) \ $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \ + $(eval LOCAL_HEADER_LIBRARIES := $(header_libraries)) \ $(eval LOCAL_SRC_FILES := $(file)) \ $(eval LOCAL_CFLAGS := $(libnativebridge_tests_common_cflags)) \ $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \ @@ -49,6 +52,7 @@ $(foreach file,$(test_src_files), \ $(foreach file,$(test_src_files), \ $(eval include $(CLEAR_VARS)) \ $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \ + $(eval LOCAL_HEADER_LIBRARIES := $(header_libraries)) \ $(eval LOCAL_SRC_FILES := $(file)) \ $(eval LOCAL_CFLAGS := $(libnativebridge_tests_common_cflags)) \ $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \ |