diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2015-09-01 16:51:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-01 16:51:26 +0000 |
| commit | 8f29c9326421b210a6a5ae5b7a887f7553f541e5 (patch) | |
| tree | 34fd212af2977e84c3a744071a99198171bd0bab | |
| parent | a51bfe906e899b3692af1717cc87deffed245f92 (diff) | |
| parent | a471c1b8a417c6c393918315beba1595e43a04a7 (diff) | |
| download | expat-brillo-m9-release.tar.gz | |
am a471c1b8: am 47d70030: Merge "Whitelist windows modules"android-n-preview-1brillo-m9-releasebrillo-m9-devbrillo-m8-releasebrillo-m8-devbrillo-m10-releasebrillo-m10-dev
* commit 'a471c1b8a417c6c393918315beba1595e43a04a7':
Whitelist windows modules
| -rw-r--r-- | Android.mk | 13 |
1 files changed, 3 insertions, 10 deletions
@@ -28,13 +28,10 @@ LOCAL_SRC_FILES := $(common_SRC_FILES) 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_SRC_FILES := $(common_SRC_FILES) 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 |