Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a19987d3 authored by dimitry's avatar dimitry
Browse files

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
parent f26bef86

core/soong_cc_prebuilt.mk

+3 −1
Original line number Original line Diff line number Diff line
@@ -223,7 +223,9 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) 
#

#

# Filter out some NDK libraries that are not being exported.

# Filter out some NDK libraries that are not being exported.

my_static_libraries := \

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))

      $(LOCAL_STATIC_LIBRARIES))

installed_static_library_notice_file_targets := \

installed_static_library_notice_file_targets := \

    $(foreach lib,$(my_static_libraries) $(LOCAL_WHOLE_STATIC_LIBRARIES), \

    $(foreach lib,$(my_static_libraries) $(LOCAL_WHOLE_STATIC_LIBRARIES), \