summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2013-02-26 15:26:29 +0000
committerTorne (Richard Coles) <torne@google.com>2013-02-26 15:27:04 +0000
commitece6e461209efdbe0efca59cca9056cfc505b65c (patch)
treeaba283f074eae6a185290ce388fa599c4a308eeb
parentb455389686a6d4225f9270c4a2f63e03a8c0f6cd (diff)
downloadwebview-ece6e461209efdbe0efca59cca9056cfc505b65c.tar.gz
Allow webviewchromium to be built on all platforms.
We have working makefiles for x86 and mac hosts now, so allow webviewchromium to build by default on all platforms. Bug: 7556801 Change-Id: Iba945dec097a657e354fd5788b96cdfb96bde9d7
-rw-r--r--Android.mk14
1 files changed, 1 insertions, 13 deletions
diff --git a/Android.mk b/Android.mk
index 59dc4ad..8f47601 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,21 +22,9 @@ include $(CLEAR_VARS)
LOCAL_MODULE := webview
LOCAL_MODULE_TAGS := optional
-LOCAL_REQUIRED_MODULES := libwebcore
-
-# Currently webviewchromium only builds on ARM, on Linux hosts.
-ifeq ($(TARGET_ARCH),arm)
-ifeq ($(HOST_OS),linux)
-LOCAL_REQUIRED_MODULES += webviewchromium
-endif
-endif
+LOCAL_REQUIRED_MODULES := libwebcore webviewchromium
include $(BUILD_PHONY_PACKAGE)
-# 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