Track libnativehelper move for PDK.

Bug: 6369821
Change-Id: I4dfd9eece9f6912a37c3caee77bd0eadb9313160

diff --git a/core/config.mk b/core/config.mk
index dabdfde..620739f 100644 (file)
--- a/core/config.mk
+++ b/core/config.mk
@@ -28,7 +28,7 @@ SRC_HEADERS := \
        $(TOPDIR)hardware/libhardware/include \
        $(TOPDIR)hardware/libhardware_legacy/include \
        $(TOPDIR)hardware/ril/include \
-       $(TOPDIR)dalvik/libnativehelper/include \
+       $(TOPDIR)libnativehelper/include \
        $(TOPDIR)frameworks/native/include \
        $(TOPDIR)frameworks/native/opengl/include \
        $(TOPDIR)frameworks/av/include \

diff --git a/core/pathmap.mk b/core/pathmap.mk
index 581cf83..91a7fd4 100644 (file)
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -43,7 +43,7 @@ pathmap_INCL := \
     libhardware_legacy:hardware/libhardware_legacy/include \
     libhost:build/libs/host/include \
     libm:bionic/libm/include \
-    libnativehelper:dalvik/libnativehelper/include \
+    libnativehelper:libnativehelper/include \
     libpagemap:system/extras/libpagemap/include \
     libril:hardware/ril/include \
     libstdc++:bionic/libstdc++/include \

diff --git a/target/product/core.mk b/target/product/core.mk
index 0572e2d..8170c2f 100644 (file)
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -84,6 +84,7 @@ PRODUCT_PACKAGES := \
     libgabi++ \
     libicui18n \
     libicuuc \
+    libjavacore \
     libkeystore \
     libmdnssd \
     libnativehelper \
@@ -125,5 +126,12 @@ ifeq ($(WITH_HOST_DALVIK),true)
         apache-xml-hostdex \
         bouncycastle-hostdex \
         core-hostdex \
+        libcrypto \
+        libexpat \
+        libicui18n \
+        libicuuc \
+        libjavacore \
+        libssl \
+        libz-host \
         dalvik
 endif