commit 69d01b4fff20ab8e70c75beb8ec79685ccc37487
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jul 31 23:12:49 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 31 23:12:49 2017 +0000
tree c975944ea21576522bcf1918bf00621dd6afe965
parent 593767a7801e3c818632fc509217cdd830361dd0
parent 37ae422c6f213a1250a6f668e50990837c83d0b0

Merge "add legacy-android-test java library to PDK platform.zip" into oc-mr1-dev

core/install_jni_libs_internal.mk

diff --git a/core/install_jni_libs_internal.mk b/core/install_jni_libs_internal.mk
index 0e92153..b5f10cf 100644
--- a/core/install_jni_libs_internal.mk
+++ b/core/install_jni_libs_internal.mk
@@ -116,7 +116,7 @@
 else
 my_link_type := app:platform
 my_warn_types :=
-my_allowed_types := native:ndk native:platform
+my_allowed_types := native:ndk native:platform native:vendor
 endif
 
 my_link_deps := $(addprefix SHARED_LIBRARIES:,$(LOCAL_JNI_SHARED_LIBRARIES))

target/product/core_minimal.mk

diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index e9fbbb1..a40f216 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -72,6 +72,7 @@
     libfilterfw \
     libkeystore \
     libgatekeeper \
+    libneuralnetworks \
     libwebviewchromium_loader \
     libwebviewchromium_plat_support \
     libwilhelm \

target/product/treble_common.mk

diff --git a/target/product/treble_common.mk b/target/product/treble_common.mk
index 52e2441..0902323 100644
--- a/target/product/treble_common.mk
+++ b/target/product/treble_common.mk
@@ -89,6 +89,7 @@
     android.hidl.manager@1.0 \
     android.hidl.memory@1.0 \
     android.hidl.token@1.0 \
+    android.system.net.netd@1.0 \
     android.system.wifi.keystore@1.0 \
 
 # VNDK: