Revert^2 "art: Disable host module on darwin"
20cdf4f8c2d72198e6ea69ada92243599efd2b19
Change-Id: If91bb02f16fb3e256c6f720b3956ef2d032047b5
diff --git a/Android.mk b/Android.mk
index 7ce7ed8..5a236ce 100644
--- a/Android.mk
+++ b/Android.mk
@@ -413,6 +413,7 @@
# 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
@@ -433,6 +434,7 @@
endif
include $(BUILD_PHONY_PACKAGE)
+endif # HOST_OS != darwin
####################################################################################################
# Fake packages to ensure generation of libopenjdkd when one builds with mm/mmm/mmma.
@@ -445,6 +447,7 @@
# 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
@@ -453,6 +456,7 @@
LOCAL_IS_HOST_MODULE := true
include $(BUILD_PHONY_PACKAGE)
endif
+endif # HOST_OS != darwin
# ART on the target.
ifeq ($(ART_BUILD_TARGET_DEBUG),true)
diff --git a/build/Android.bp b/build/Android.bp
index 6ac0f5b..8d8b7e9 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -266,6 +266,10 @@
hostdex: {
required: ["libjavacrypto"],
},
+ darwin: {
+ // required module "libjavacrypto" is disabled on darwin
+ enabled: false,
+ },
},
}
diff --git a/tools/Android.bp b/tools/Android.bp
index e9badc4..042eb19 100644
--- a/tools/Android.bp
+++ b/tools/Android.bp
@@ -47,6 +47,9 @@
"dex2oat",
],
},
+ darwin: {
+ enabled: false,
+ },
},
}
@@ -66,5 +69,8 @@
"dex2oat",
],
},
+ darwin: {
+ enabled: false,
+ },
},
}