commit d09a76a935e1aedd3ec802b80ed5fb72a726375b
author Victor Khimenko <khim@google.com> Thu Sep 29 06:08:00 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 29 06:08:01 2016 +0000
tree e3721c2f4794dc21bf83e9aebdf82faa55fb7a83
parent 426da5ad3cc43336e48620605e37e9432b3cd126
parent b2797fc48b017097823b674095fd828699f8511f

Merge "Support TARGET_TRANSLATE_2ND_ARCH case"

vendor_libs/test_vendor_lib/Android.mk

diff --git a/vendor_libs/test_vendor_lib/Android.mk b/vendor_libs/test_vendor_lib/Android.mk
index 9c530ba..8ea93e9 100644
--- a/vendor_libs/test_vendor_lib/Android.mk
+++ b/vendor_libs/test_vendor_lib/Android.mk
@@ -42,6 +42,13 @@
 LOCAL_MODULE := libbt-vendor
 LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
 LOCAL_CFLAGS += -DBLUETOOTH_USE_TEST_AS_VENDOR
+ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
+# If its vendor library and secondary arch is translated then only one library
+# is provided
+ifneq (1,$(words $(LOCAL_MODULE_TARGET_ARCH)))
+LOCAL_MULTILIB := first
+endif
+endif
 else
 LOCAL_MODULE := test-vendor
 endif