Merge from Chromium at DEPS revision r199464
This commit was generated by merge_to_master.py.
Change-Id: Ic3d1f97a4fb4edd1e6ed66a70b5040da1622b5a9
diff --git a/GypAndroid.linux-x86.mk b/GypAndroid.linux-x86.mk
index 4278dcb..48f4e25 100644
--- a/GypAndroid.linux-x86.mk
+++ b/GypAndroid.linux-x86.mk
@@ -22,7 +22,14 @@
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)/chrome/chrome_strings.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_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
+include $(LOCAL_PATH)/components/autofill_risk_proto.target.linux-x86.mk
+include $(LOCAL_PATH)/components/encryptor.target.linux-x86.mk
include $(LOCAL_PATH)/components/navigation_interception.target.linux-x86.mk
include $(LOCAL_PATH)/components/navigation_interception_jni_headers.target.linux-x86.mk
include $(LOCAL_PATH)/components/tracing.target.linux-x86.mk
@@ -31,6 +38,7 @@
include $(LOCAL_PATH)/components/visitedlink_renderer.target.linux-x86.mk
include $(LOCAL_PATH)/components/web_contents_delegate_android.target.linux-x86.mk
include $(LOCAL_PATH)/components/web_contents_delegate_android_jni_headers.target.linux-x86.mk
+include $(LOCAL_PATH)/components/webdata_common.target.linux-x86.mk
include $(LOCAL_PATH)/content/browser/devtools/devtools_resources.target.linux-x86.mk
include $(LOCAL_PATH)/content/browser/speech/proto/speech_proto.target.linux-x86.mk
include $(LOCAL_PATH)/content/common_aidl.target.linux-x86.mk
@@ -104,7 +112,7 @@
include $(LOCAL_PATH)/third_party/WebKit/Source/config.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/debugger_script_source.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/generate_inspector_protocol_version.target.linux-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/generate_settings.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/generate_test_support_idls.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/injected_canvas_script_source.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/injected_script_source.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/inspector_overlay_page.target.linux-x86.mk
@@ -137,6 +145,7 @@
include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/frontend_protocol_sources.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/generate_devtools_grd.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/modules/modules.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/origin/origin.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/wtf/wtf.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/wtf/wtf_config.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/angle/src/preprocessor.target.linux-x86.mk