diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2015-08-31 19:28:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-08-31 19:28:06 +0000 |
| commit | 47d70030a603d359a89e06392415876f71756c0e (patch) | |
| tree | 9763e4d04b77f9846c95b2260a082de55eaf85a9 | |
| parent | 15c7ae3416c46c9f753df12e194511db76afea41 (diff) | |
| parent | eb620c441ddcde420953949e227029d6c2a87bad (diff) | |
| download | expat-47d70030a603d359a89e06392415876f71756c0e.tar.gz | |
Merge "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 include $(BUILD_HOST_STATIC_LIBRARY) @@ -46,13 +43,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 |