diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-17 14:55:54 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-17 14:55:54 +0100 |
| commit | 7dbb3d5cf0c15f500944d211057644d6a2f37371 (patch) | |
| tree | 701119ba0596f51b0ab466d6472b0f98211359c5 /Android.mk | |
| parent | b2ecf4836a0eb284ddac7746b1f7ba613777a739 (diff) | |
| download | chromium_org-7dbb3d5cf0c15f500944d211057644d6a2f37371.tar.gz | |
Merge from Chromium at DEPS revision r212014
This commit was generated by merge_to_master.py.
Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index 7713389d80..4513ef5088 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 |