diff options
| author | dimitry <dimitry@google.com> | 2019-05-09 16:32:02 +0200 |
|---|---|---|
| committer | dimitry <dimitry@google.com> | 2019-05-09 16:35:41 +0200 |
| commit | a19987d3c29054ddee45968f0c2fe62b156ada47 (patch) | |
| tree | 1d5b90881336ecf740372fee60f19728bb6f3ac4 | |
| parent | f26bef86ec7fc224a3ea73dfeb137e91001897f5 (diff) | |
| download | build-a19987d3c29054ddee45968f0c2fe62b156ada47.tar.gz | |
Filter out .native_bridge static libs from NOTICE files
LOCAL_STATIC_LIBRARIES may contain .native_bridge suffix
when built for translated targets.
This CL makes the NOTICE file exception apply for them too.
Bug: http://b/77159578
Test: make
Change-Id: Ic8a18f06afa0c460751f21587b7f751ac0ae4a3f
| -rw-r--r-- | core/soong_cc_prebuilt.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/soong_cc_prebuilt.mk b/core/soong_cc_prebuilt.mk index 31b0e63fd2..7a8f46e091 100644 --- a/core/soong_cc_prebuilt.mk +++ b/core/soong_cc_prebuilt.mk @@ -223,7 +223,9 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) # # Filter out some NDK libraries that are not being exported. my_static_libraries := \ - $(filter-out ndk_libc++_static ndk_libc++abi ndk_libandroid_support ndk_libunwind, \ + $(filter-out ndk_libc++_static ndk_libc++abi ndk_libandroid_support ndk_libunwind \ + ndk_libc++_static.native_bridge ndk_libc++abi.native_bridge \ + ndk_libandroid_support.native_bridge ndk_libunwind.native_bridge, \ $(LOCAL_STATIC_LIBRARIES)) installed_static_library_notice_file_targets := \ $(foreach lib,$(my_static_libraries) $(LOCAL_WHOLE_STATIC_LIBRARIES), \ |