commit 19ae8d98f3347eeb40cfc16afc2769f0064bd281
author Alex Light <allight@google.com> Fri Nov 03 21:46:30 2017 +0000
committer Alex Light <allight@google.com> Fri Nov 03 14:48:27 2017 -0700
tree 88501027cee311bcc99c91652a8d2695b3da1189
parent eab990b981d3a9eea45f4afad8920b3d87c4b03d

Revert "Fix mac-sdk build & support darwin hosts (hopefully)"

There isn't any real reason to build darwin at all so we will just
disable it entirely.

This reverts commit eab990b981d3a9eea45f4afad8920b3d87c4b03d.

Reason for revert: Disabling darwin build seems a better long-term
solution.

Test: linux builds.

Change-Id: I2a113ca379c9aa4ca858fd6599275bd892d87d2e

Android.bp

diff --git a/Android.bp b/Android.bp
index 6e21a47..2854350 100644
--- a/Android.bp
+++ b/Android.bp
@@ -28,27 +28,21 @@
         "-Wno-unused-parameter",
     ],
     notice: "LICENSE",
+    target: {
+        darwin: {
+            enabled: false,
+        },
+    },
 }
 
 cc_library_headers {
     name: "javavm_headers",
     export_include_dirs: [
         "src/share/javavm/export",
+        "src/solaris/javavm/export",
     ],
     host_supported: true,
     device_supported: true,
-    target: {
-        linux: {
-            export_include_dirs: [
-                "src/solaris/javavm/export",
-            ],
-        },
-        darwin: {
-            export_include_dirs: [
-                "src/macosx/javavm/export",
-            ],
-        },
-    },
 }
 
 cc_library_headers {