commit 20cdf4f8c2d72198e6ea69ada92243599efd2b19
author Insaf Latypov <saferif@google.com> Thu Aug 06 15:36:57 2020 +0000
committer Insaf Latypov <saferif@google.com> Thu Aug 06 15:48:19 2020 +0000
tree ef2faf0992786d72043fac953f9f6cb9f2bcab40
parent c4cd59b1f17865d9ba1f362cb5c187cb95982355

Revert "art: Disable host module on darwin"

Revert "releasetools: Disable host module on darwin"

Revert "conscrypt: Disable host module on darwin"

Revert submission 1385032-mac-required-fix

Reason for revert: breaks the build on aosp-master
Reverted Changes:
I13335299c:releasetools: Disable host module on darwin
I728a4677a:conscrypt: Disable host module on darwin
I8f3435ff1:art: Remove dependencies on platform unavailable m...
Ibb9248ef4:art: Disable host module on darwin
I7db68a629:libcore: Disable host module on darwin

Bug: 163030797
Change-Id: Ieb4dad3d3c6de5bd5d24d0f3821740e0352dafe9

Android.mk

diff --git a/Android.mk b/Android.mk
index 5a236ce..7ce7ed8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -413,7 +413,6 @@
 # The art-tools package depends on helpers and tools that are useful for developers. Similar
 # dependencies exist for the APEX builds for these tools (see build/apex/Android.bp).
 
-ifneq ($(HOST_OS),darwin)
 include $(CLEAR_VARS)
 LOCAL_MODULE := art-tools
 LOCAL_IS_HOST_MODULE := true
@@ -434,7 +433,6 @@
 endif
 
 include $(BUILD_PHONY_PACKAGE)
-endif # HOST_OS != darwin
 
 ####################################################################################################
 # Fake packages to ensure generation of libopenjdkd when one builds with mm/mmm/mmma.
@@ -447,7 +445,6 @@
 #         64-bit systems, even if it is the default.
 
 # ART on the host.
-ifneq ($(HOST_OS),darwin)
 ifeq ($(ART_BUILD_HOST_DEBUG),true)
 include $(CLEAR_VARS)
 LOCAL_MODULE := art-libartd-libopenjdkd-host-dependency
@@ -456,7 +453,6 @@
 LOCAL_IS_HOST_MODULE := true
 include $(BUILD_PHONY_PACKAGE)
 endif
-endif # HOST_OS != darwin
 
 # ART on the target.
 ifeq ($(ART_BUILD_TARGET_DEBUG),true)

build/Android.bp

diff --git a/build/Android.bp b/build/Android.bp
index 8d8b7e9..6ac0f5b 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -266,10 +266,6 @@
         hostdex: {
             required: ["libjavacrypto"],
         },
-        darwin: {
-            // required module "libjavacrypto" is disabled on darwin
-            enabled: false,
-        },
     },
 }
 

tools/Android.bp

diff --git a/tools/Android.bp b/tools/Android.bp
index 042eb19..e9badc4 100644
--- a/tools/Android.bp
+++ b/tools/Android.bp
@@ -47,9 +47,6 @@
                 "dex2oat",
             ],
         },
-        darwin: {
-            enabled: false,
-        },
     },
 }
 
@@ -69,8 +66,5 @@
                 "dex2oat",
             ],
         },
-        darwin: {
-            enabled: false,
-        },
     },
 }