commit 0225f8e2939a9340cb7dcebfcfe7996a2bd9bce9
author David Sehr <sehr@google.com> Wed Jan 31 08:52:24 2018 +0000
committer David Sehr <sehr@google.com> Wed Jan 31 01:24:53 2018 -0800
tree fd32362dff4ecdc8ff8b0d800a1b46fb0d9d0104
parent c7e546ff3963a1d51b1f100d308db735bd19f736

Revert "Revert "Make libdexfile build independent of runtime dir""

This reverts commit 787784f9effb126b5d0d3dc97d544c4a477b5daf.

Reason for revert: Bot configuration issue.

Change-Id: I6a10bb4a9571f89c7e4dd095f9157e830a44e2de
Bug: 22322814
Test: make -j 50 checkbuild

test/Android.bp

diff --git a/test/Android.bp b/test/Android.bp
index 730818c..72e8eee 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -62,6 +62,7 @@
         "libvixld-arm",
         "libvixld-arm64",
         "libart-gtest",
+        "libdexfile",
 
         "libbase",
         "libicuuc",
@@ -113,6 +114,7 @@
     shared_libs: [
         "libartd",
         "libartd-compiler",
+        "libdexfile",
     ],
     static_libs: [
         "libgtest",
@@ -149,6 +151,7 @@
     shared_libs: [
         "libartd",
         "libartd-compiler",
+        "libdexfile",
         "libbase",
         "libbacktrace",
     ],
@@ -166,6 +169,7 @@
         "art_defaults",
     ],
     shared_libs: [
+        "libdexfile",
         "libbacktrace",
         "libbase",
         "libnativehelper",
@@ -264,6 +268,7 @@
         "1943-suspend-raw-monitor-wait/native_suspend_monitor.cc",
     ],
     shared_libs: [
+        "libdexfile",
         "libbase",
     ],
     header_libs: [
@@ -394,6 +399,7 @@
         "708-jit-cache-churn/jit.cc",
     ],
     shared_libs: [
+        "libdexfile",
         "libbacktrace",
         "libbase",
         "libnativehelper",