commit a8750f0dfb57b41cbf652ea22d54de2620038b3c
author Jiyong Park <jiyong@google.com> Thu Apr 12 10:40:29 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Apr 12 10:40:29 2018 -0700
tree e2c6ebdbaa3def68e9a353394d1572d85e39c548
parent 0cf73852fc2359a166806d39da84367ba0c42a96
parent 16a4fb198b31243cd3914c7799cb1fa09e236e53

Merge "Allow native:vendor to vendor apks" am: f2fc1418d3
am: 16a4fb198b

Change-Id: Ie5bbf02c8e8452381b38323d96d887126d268b86

core/install_jni_libs_internal.mk

diff --git a/core/install_jni_libs_internal.mk b/core/install_jni_libs_internal.mk
index ab5fd2c..a99d88a 100644
--- a/core/install_jni_libs_internal.mk
+++ b/core/install_jni_libs_internal.mk
@@ -109,6 +109,9 @@
 my_link_type := app:sdk
 my_warn_types := native:platform $(my_warn_ndk_types)
 my_allowed_types := $(my_allowed_ndk_types)
+    ifneq (,$(filter true,$(LOCAL_VENDOR_MODULE) $(LOCAL_ODM_MODULE) $(LOCAL_PROPRIETARY_MODULE)))
+        my_allowed_types += native:vendor native:vndk
+    endif
 else
 my_link_type := app:platform
 my_warn_types := $(my_warn_ndk_types)