summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authortorne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-17 11:21:59 +0000
committertorne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-17 11:21:59 +0000
commit56063a1ab027a533efbc2cf42316242fcfe85a83 (patch)
tree515254db28558cedf6e2f96f8270423def57517e /Android.mk
parentd6adbef5e7f6791969e7bcd3af8b25d2dd913b79 (diff)
downloadchromium_src-56063a1ab027a533efbc2cf42316242fcfe85a83.zip
chromium_src-56063a1ab027a533efbc2cf42316242fcfe85a83.tar.gz
chromium_src-56063a1ab027a533efbc2cf42316242fcfe85a83.tar.bz2
Android WebView: don't switch debug/release automatically.
Changing build config based on TARGET_BUILD_VARIANT breaks the buildbots downstream; just default it to Release all the time. Developers can manually specify GYP_CONFIGURATION=Debug at make time. NOTRY=true BUG= R=benm@chromium.org Review URL: https://codereview.chromium.org/19463006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212014 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk6
1 files changed, 2 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index 7713389..4513ef5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,11 +14,9 @@ CHROMIUM_DIR := $(call my-dir)
# WebView build using the Android build system.
ifneq (,$(wildcard $(CHROMIUM_DIR)/GypAndroid.$(HOST_OS)-$(TARGET_ARCH).mk))
-ifeq ($(TARGET_BUILD_VARIANT),eng)
-GYP_CONFIGURATION := Debug
-else
+# We default to release for the Android build system. Developers working on
+# WebView code can build with "make GYP_CONFIGURATION=Debug".
GYP_CONFIGURATION := Release
-endif
include $(CHROMIUM_DIR)/GypAndroid.$(HOST_OS)-$(TARGET_ARCH).mk
include $(CHROMIUM_DIR)/android_webview/Android.mk