From 0757768f4309664a357c5ccb4728eb9407ad3700 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Mon, 26 Jan 2015 09:52:28 -0800 Subject: [PATCH] Build hostdex on only Linux. Change-Id: I9213684e4c65632c54e9929f693f4b6a24beb95a --- core/host_dalvik_java_library.mk | 3 +++ core/host_dalvik_static_java_library.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/core/host_dalvik_java_library.mk b/core/host_dalvik_java_library.mk index 061511b0d..e946b24db 100644 --- a/core/host_dalvik_java_library.mk +++ b/core/host_dalvik_java_library.mk @@ -20,6 +20,7 @@ # They will be compiled against libcore and not the host JRE. # +ifeq ($(HOST_OS),linux) USE_CORE_LIB_BOOTCLASSPATH := true ####################################### @@ -108,3 +109,5 @@ $(LOCAL_BUILT_MODULE): $(built_dex) $(java_resource_sources) $(add-dex-to-package) USE_CORE_LIB_BOOTCLASSPATH := + +endif diff --git a/core/host_dalvik_static_java_library.mk b/core/host_dalvik_static_java_library.mk index 3ae74e42f..9e5aaa3da 100644 --- a/core/host_dalvik_static_java_library.mk +++ b/core/host_dalvik_static_java_library.mk @@ -19,6 +19,7 @@ # These libraries will be compiled against libcore and not the host # JRE. # +ifeq ($(HOST_OS),linux) USE_CORE_LIB_BOOTCLASSPATH := true LOCAL_JAVA_LIBRARIES += core-libart-hostdex @@ -26,3 +27,5 @@ LOCAL_JAVA_LIBRARIES += core-libart-hostdex include $(BUILD_SYSTEM)/host_java_library.mk USE_CORE_LIB_BOOTCLASSPATH := + +endif