summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2013-04-19 12:00:40 +0100
committerTorne (Richard Coles) <torne@google.com>2013-04-19 12:00:40 +0100
commit9bf6038aae13d5b9b4ac202efa046735646f4c5c (patch)
treefe939244334e7cb1a855ce5f6c3a3bb5a79c5bdc /Android.mk
parent86ba4c3b3e059bdddcace47df9c47723b4fb3abc (diff)
downloadandroid_frameworks_webview-9bf6038aae13d5b9b4ac202efa046735646f4c5c.tar.gz
android_frameworks_webview-9bf6038aae13d5b9b4ac202efa046735646f4c5c.tar.bz2
android_frameworks_webview-9bf6038aae13d5b9b4ac202efa046735646f4c5c.zip
Revert "Disable building on Mac again."
Mac builds are now fine. This reverts commit bd30019ef43699a933f5965a5e078bb1a15aa8b8. Bug: 8326522
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk6
1 files changed, 0 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk
index 3c354f1..12f236a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,19 +26,13 @@ LOCAL_REQUIRED_MODULES := libwebcore
# webviewchromium doesn't have makefiles for MIPS yet.
ifneq ($(TARGET_ARCH),mips)
-# webviewchromium is currently broken on mac (b/8326522)
-ifeq ($(HOST_OS),linux)
LOCAL_REQUIRED_MODULES += webviewchromium
endif
-endif
include $(BUILD_PHONY_PACKAGE)
# webviewchromium doesn't have makefiles for MIPS yet.
ifneq ($(TARGET_ARCH),mips)
-# webviewchromium is currently broken on mac (b/8326522)
-ifeq ($(HOST_OS),linux)
# Include all the makefiles for subdirectories.
include $(call all-makefiles-under,$(LOCAL_PATH))
endif
-endif