summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2012-11-21 14:49:18 +0000
committerTorne (Richard Coles) <torne@google.com>2012-11-21 14:49:18 +0000
commit4c41d0c5e4434c0cd0f05f03f71101ea90626b22 (patch)
treee8b90612429c63579e9f66fc6d28d1639c684400
parent08a5e00cdfb74f4ffd843d2d0a9b0b40b86b107a (diff)
downloadwebview-4c41d0c5e4434c0cd0f05f03f71101ea90626b22.tar.gz
Disable building webviewchromium on Mac for now.
We need separate gyp-generated makefiles, or a better solution, to be able to build on Mac. Disable it unless HOST_OS is linux for now. Change-Id: I5e57f9886ecbe61aa36178804a8e54e84b5e069a
-rw-r--r--Android.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 39c4be5..59dc4ad 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,15 +24,19 @@ LOCAL_MODULE := webview
LOCAL_MODULE_TAGS := optional
LOCAL_REQUIRED_MODULES := libwebcore
-# Currently webviewchromium only builds on ARM.
+# Currently webviewchromium only builds on ARM, on Linux hosts.
ifeq ($(TARGET_ARCH),arm)
+ifeq ($(HOST_OS),linux)
LOCAL_REQUIRED_MODULES += webviewchromium
endif
+endif
include $(BUILD_PHONY_PACKAGE)
-# Currently webviewchromium only builds on ARM.
+# Currently webviewchromium only builds on ARM, on Linux hosts.
ifeq ($(TARGET_ARCH),arm)
+ifeq ($(HOST_OS),linux)
# Include all the makefiles for subdirectories.
include $(call all-makefiles-under,$(LOCAL_PATH))
endif
+endif