commit 78330f008c6427f8d9ce9450aec36c0461bc5440
author Idries Hamadi <idries@google.com> Thu Sep 13 18:00:25 2018 +0100
committer Idries Hamadi <idries@google.com> Fri Oct 05 17:55:05 2018 +0100
tree 80d5606b79cbc782e06276cf9185de8c9aef7c6f
parent 07602496234e07d7b636fe8b8fadf275154b05ad

Reverted aapt dependency to be a dependency on libandroidfw

Removed call to external aapt2 process
Replaced several layers of error handling with calls to fatal()
Changed output messages for failures to be more useful for diagnostics

Bug: 116753196
Test: mm
Test: adb install -r --fastdeploy --force-agent --local-agent ~/example_apks/example.apk
Test: adb install -r --fastdeploy --no-streaming --force-agent --local-agent ~/example_apks/example.apk

Change-Id: I6006d8aa584e789a086a31e79a41d1416e54402a

Android.bp

diff --git a/Android.bp b/Android.bp
index 6cff0be..f7e5e4e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -174,6 +174,12 @@
         "libdiagnose_usb",
         "libmdnssd",
         "libusb",
+        "libandroidfw",
+        "libziparchive",
+        "libz",
+        "libutils",
+        "liblog",
+        "libcutils",
     ],
 }
 
@@ -256,6 +262,12 @@
         "liblog",
         "libmdnssd",
         "libusb",
+        "libandroidfw",
+        "libziparchive",
+        "libz",
+        "libutils",
+        "liblog",
+        "libcutils",
     ],
 
     stl: "libc++_static",