From e481e7d4942dbff31aefcd4fae5ab8e9fe10335d Mon Sep 17 00:00:00 2001
From: Logan Chien <tzuhsiang.chien@gmail.com>
Date: Sun, 25 Jan 2015 21:15:12 +0800
Subject: [PATCH 1/2] Fix comma in $(if ...).

Change-Id: I2f9fba5b5c0384ef12ee9e5f48fa01102436a425
---
 core/definitions.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/definitions.mk b/core/definitions.mk
index 02781501e..3d9a73aeb 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1329,7 +1329,7 @@ define transform-o-to-shared-lib-inner
 $(hide) $(PRIVATE_CXX) \
 	-nostdlib -Wl,-soname,$(notdir $@) \
 	-Wl,--gc-sections \
-	$(if $(filter true,$(PRIVATE_CLANG)),-shared,-Wl,-shared) \
+	$(if $(filter true,$(PRIVATE_CLANG)),-shared,-Wl$(comma)-shared) \
 	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
 	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \
 	$(PRIVATE_ALL_OBJECTS) \

From 0757768f4309664a357c5ccb4728eb9407ad3700 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Mon, 26 Jan 2015 09:52:28 -0800
Subject: [PATCH 2/2] 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