commit 2253fbcdb9df8d99c1e65c4568ad9b7861e2e3b3
author Steven Moreland <smoreland@google.com> Thu Jan 24 12:02:37 2019 -0800
committer Steven Moreland <smoreland@google.com> Fri Jan 25 02:43:07 2019 +0000
tree d177e9581825feaa5b093ee2cb49d1be4905cb40
parent 9242ba8f1e4c4164c868f948e8c317b0d7850ee9

Use hidl libs from framework.jar.

Rather than including them here as well (since there is a lot of
overlap).

Test: (sanity) boot Pixel 2 and check logs
Bug: 111107855
Change-Id: I5f0e951d9cf8dfe06ea6cc9b1470a6e68316328e
Merged-In: I5f0e951d9cf8dfe06ea6cc9b1470a6e68316328e

Android.bp

diff --git a/Android.bp b/Android.bp
index 8aea8ad..4925d51 100644
--- a/Android.bp
+++ b/Android.bp
@@ -40,16 +40,7 @@
         "src/java/**/*.logtags",
     ],
 
-    jarjar_rules: ":framework-hidl-jarjar",
-
     libs: [
-        "voip-common",
-        "ims-common",
-        "services",
-    ],
-    static_libs: [
-        "telephony-protos",
-        "ecc-protos-lite",
         "android.hardware.radio-V1.0-java",
         "android.hardware.radio-V1.1-java",
         "android.hardware.radio-V1.2-java",
@@ -59,8 +50,14 @@
         "android.hardware.radio.config-V1.1-java",
         "android.hardware.radio.config-V1.2-java",
         "android.hardware.radio.deprecated-V1.0-java",
-        "android.hidl.base-V1.0-java",
-	"android-support-annotations",
+        "voip-common",
+        "ims-common",
+        "services",
+    ],
+    static_libs: [
+        "telephony-protos",
+        "ecc-protos-lite",
+        "android-support-annotations",
     ],
 
     product_variables: {