commit 52fc7ab4d557cfbcd1a7494fd5bf52671c0e122f
author David Srbecky <dsrbecky@google.com> Fri May 03 11:03:52 2019 +0100
committer David Srbecky <dsrbecky@google.com> Fri May 03 13:58:40 2019 +0000
tree 7f8cb1a73ecb9599b2a6687892ea66820d70cca9
parent 917cfdb915bd7674e27d6fe353274318862e0d8b

Fix mac build: Enable libdexfile_external (attempt 2)

Bug: 131709594
Change-Id: Id9110adfcb42a94701eccc421ca7d9cceacd4cd2

libdexfile/Android.bp

diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp
index e3452a3..2c4c3d8 100644
--- a/libdexfile/Android.bp
+++ b/libdexfile/Android.bp
@@ -266,11 +266,6 @@
     shared_libs: [
         "libbase",
     ],
-    target: {
-        darwin: {
-            enabled: true,
-        },
-    },
     stubs: {
         symbol_file: "external/libdexfile_external.map.txt",
         versions: ["1"],
@@ -283,6 +278,11 @@
         "art_defaults",
         "libdexfile_external-defaults",
     ],
+    target: {
+        darwin: {
+            enabled: true,
+        },
+    },
     shared_libs: [
         "libdexfile",
     ],
@@ -294,6 +294,11 @@
         "art_debug_defaults",
         "libdexfile_external-defaults",
     ],
+    target: {
+        darwin: {
+            enabled: true,
+        },
+    },
     shared_libs: [
         "libdexfiled",
     ],