commit 44199a57da6ae5eb2f0c72a211d10a0d77c97752
author Steven Moreland <smoreland@google.com> Thu Sep 13 15:14:35 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 13 15:14:35 2018 +0000
tree 4efb6eebb4872daaf232a7444d7ee3161fed0392
parent 007f27aa4a522ab466e0ef1478b565f99ff54e32
parent ccc7ce105038c431618a55775f6afa9ea686dacb

Merge "Remove HIDL libs from PRODUCT_BOOT_JARS."

core/pdk_config.mk

diff --git a/core/pdk_config.mk b/core/pdk_config.mk
index 4c582e3..b3cbb9c 100644
--- a/core/pdk_config.mk
+++ b/core/pdk_config.mk
@@ -13,8 +13,6 @@
 # all paths under out dir
 PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR += \
   target/common/obj/JAVA_LIBRARIES/android.test.runner_intermediates \
-  target/common/obj/JAVA_LIBRARIES/android.hidl.base-V1.0-java_intermediates \
-  target/common/obj/JAVA_LIBRARIES/android.hidl.manager-V1.0-java_intermediates \
   target/common/obj/JAVA_LIBRARIES/android-common_intermediates \
   target/common/obj/JAVA_LIBRARIES/android-ex-camera2_intermediates \
   target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates \

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index bcbb951..6cc6561 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -270,9 +270,7 @@
     framework \
     telephony-common \
     voip-common \
-    ims-common \
-    android.hidl.base-V1.0-java \
-    android.hidl.manager-V1.0-java
+    ims-common
 
 # Add the compatibility library that is needed when org.apache.http.legacy
 # is removed from the bootclasspath.