From b9346013b6a2dd3408793508f1ec8ab9a37d85ca Mon Sep 17 00:00:00 2001 From: Justin Yun Date: Thu, 12 Apr 2018 12:25:12 +0900 Subject: [PATCH] Exclude libclang_rt from checking vndk list libclang_rt libs are prebuilt libs that have different names by the architecture they are built. Bug: 77931086 Bug: 77816590 Bug: 67002788 Test: 'm check-vndk-list' for various architectures. Change-Id: Iacb3979b6e5df7e9ba8073470aab23c603b4db55 Merged-In: Iacb3979b6e5df7e9ba8073470aab23c603b4db55 (cherry picked from commit 016020923a5129e598cfb45b1223522cdcfcaeac) --- target/product/vndk/Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/product/vndk/Android.mk b/target/product/vndk/Android.mk index 93aaf3798..812a814c7 100644 --- a/target/product/vndk/Android.mk +++ b/target/product/vndk/Android.mk @@ -8,11 +8,11 @@ $(INTERNAL_VNDK_LIB_LIST): @echo "Generate: $@" @mkdir -p $(dir $@) $(hide) echo -n > $@ - $(hide) $(foreach lib, $(LLNDK_LIBRARIES), \ + $(hide) $(foreach lib, $(filter-out libclang_rt.%,$(LLNDK_LIBRARIES)), \ echo LLNDK: $(lib).so >> $@;) $(hide) $(foreach lib, $(VNDK_SAMEPROCESS_LIBRARIES), \ echo VNDK-SP: $(lib).so >> $@;) - $(hide) $(foreach lib, $(VNDK_CORE_LIBRARIES), \ + $(hide) $(foreach lib, $(filter-out libclang_rt.%,$(VNDK_CORE_LIBRARIES)), \ echo VNDK-core: $(lib).so >> $@;) $(hide) $(foreach lib, $(VNDK_PRIVATE_LIBRARIES), \ echo VNDK-private: $(lib).so >> $@;)