commit 8f29c9326421b210a6a5ae5b7a887f7553f541e5
author Dan Willemsen <dwillemsen@google.com> Tue Sep 01 16:51:26 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 01 16:51:26 2015 +0000
tree 34fd212af2977e84c3a744071a99198171bd0bab
parent a51bfe906e899b3692af1717cc87deffed245f92
parent a471c1b8a417c6c393918315beba1595e43a04a7

am a471c1b8: am 47d70030: Merge "Whitelist windows modules"

* commit 'a471c1b8a417c6c393918315beba1595e43a04a7':
  Whitelist windows modules

Android.mk

diff --git a/Android.mk b/Android.mk
index 810e9f7..cb4025a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -28,13 +28,10 @@
 LOCAL_CFLAGS += $(common_CFLAGS)
 LOCAL_C_INCLUDES += $(common_C_INCLUDES)
 
-ifeq ($(HOST_OS),darwin)
-	LOCAL_CFLAGS += -fno-common
-endif
+LOCAL_CFLAGS_darwin += -fno-common
 
 LOCAL_MODULE:= libexpat
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/lib
 
 LOCAL_MULTILIB := both
@@ -48,13 +45,9 @@
 LOCAL_CFLAGS += $(common_CFLAGS)
 LOCAL_C_INCLUDES += $(common_C_INCLUDES)
 
-ifeq ($(HOST_OS),darwin)
-	LOCAL_CFLAGS += -fno-common
-endif
+LOCAL_CFLAGS_darwin += -fno-common
 
 LOCAL_MODULE:= libexpat-host
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_MODULE_TAGS := optional
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/lib
 LOCAL_MULTILIB := both