Merge from Chromium at DEPS revision r210036
This commit was generated by merge_to_master.py.
Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
diff --git a/GypAndroid.linux-x86.mk b/GypAndroid.linux-x86.mk
index c3ba074..69b80e1 100644
--- a/GypAndroid.linux-x86.mk
+++ b/GypAndroid.linux-x86.mk
@@ -2,7 +2,7 @@
LOCAL_PATH := $(call my-dir)
-GYP_DEFAULT_CONFIGURATION := Debug
+GYP_CONFIGURATION ?= Debug
include $(LOCAL_PATH)/android_webview/All.target.linux-x86.mk
include $(LOCAL_PATH)/android_webview/android_webview_common.target.linux-x86.mk
@@ -21,12 +21,12 @@
include $(LOCAL_PATH)/base/base_static.target.linux-x86.mk
include $(LOCAL_PATH)/base/symbolize.target.linux-x86.mk
include $(LOCAL_PATH)/base/third_party/dynamic_annotations/dynamic_annotations.target.linux-x86.mk
-include $(LOCAL_PATH)/build/temp_gyp/googleurl.target.linux-x86.mk
include $(LOCAL_PATH)/cc/cc.target.linux-x86.mk
include $(LOCAL_PATH)/components/auto_login_parser.target.linux-x86.mk
-include $(LOCAL_PATH)/components/autofill_browser.target.linux-x86.mk
include $(LOCAL_PATH)/components/autofill_content_browser.target.linux-x86.mk
+include $(LOCAL_PATH)/components/autofill_content_renderer.target.linux-x86.mk
include $(LOCAL_PATH)/components/autofill_content_risk_proto.target.linux-x86.mk
+include $(LOCAL_PATH)/components/autofill_core_browser.target.linux-x86.mk
include $(LOCAL_PATH)/components/autofill_core_common.target.linux-x86.mk
include $(LOCAL_PATH)/components/autofill_jni_headers.target.linux-x86.mk
include $(LOCAL_PATH)/components/autofill_regexes.target.linux-x86.mk