Merge from Chromium at DEPS revision r190564
This commit was generated by merge_to_master.py.
Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
diff --git a/GypAndroid.linux-x86.mk b/GypAndroid.linux-x86.mk
new file mode 100644
index 0000000..ea353b6
--- /dev/null
+++ b/GypAndroid.linux-x86.mk
@@ -0,0 +1,231 @@
+# This file is generated by gyp; do not edit.
+
+
+LOCAL_PATH := $(call my-dir)
+GYP_ABS_ANDROID_TOP_DIR := $(shell pwd)
+GYP_DEFAULT_CONFIGURATION := Debug
+
+include $(LOCAL_PATH)/android_webview/All.target.linux-x86.mk
+include $(LOCAL_PATH)/android_webview/android_webview_common.target.linux-x86.mk
+include $(LOCAL_PATH)/android_webview/android_webview_pak.target.linux-x86.mk
+include $(LOCAL_PATH)/android_webview/libwebviewchromium.target.linux-x86.mk
+include $(LOCAL_PATH)/android_webview/native/android_jar_jni_headers.target.linux-x86.mk
+include $(LOCAL_PATH)/android_webview/native/android_webview_native_jni.target.linux-x86.mk
+include $(LOCAL_PATH)/android_webview/native/webview_native.target.linux-x86.mk
+include $(LOCAL_PATH)/base/allocator/allocator_extension_thunks.target.linux-x86.mk
+include $(LOCAL_PATH)/base/base.target.linux-x86.mk
+include $(LOCAL_PATH)/base/base_i18n.target.linux-x86.mk
+include $(LOCAL_PATH)/base/base_jni_headers.target.linux-x86.mk
+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/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
+include $(LOCAL_PATH)/components/visitedlink_browser.target.linux-x86.mk
+include $(LOCAL_PATH)/components/visitedlink_common.target.linux-x86.mk
+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)/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
+include $(LOCAL_PATH)/content/content.target.linux-x86.mk
+include $(LOCAL_PATH)/content/content_app.target.linux-x86.mk
+include $(LOCAL_PATH)/content/content_browser.target.linux-x86.mk
+include $(LOCAL_PATH)/content/content_common.target.linux-x86.mk
+include $(LOCAL_PATH)/content/content_gpu.target.linux-x86.mk
+include $(LOCAL_PATH)/content/content_jni_headers.target.linux-x86.mk
+include $(LOCAL_PATH)/content/content_plugin.target.linux-x86.mk
+include $(LOCAL_PATH)/content/content_ppapi_plugin.target.linux-x86.mk
+include $(LOCAL_PATH)/content/content_renderer.target.linux-x86.mk
+include $(LOCAL_PATH)/content/content_resources.target.linux-x86.mk
+include $(LOCAL_PATH)/content/content_utility.target.linux-x86.mk
+include $(LOCAL_PATH)/content/content_worker.target.linux-x86.mk
+include $(LOCAL_PATH)/content/generate_content_resources.target.linux-x86.mk
+include $(LOCAL_PATH)/content/java_set_jni_headers.target.linux-x86.mk
+include $(LOCAL_PATH)/content/page_transition_types_java.target.linux-x86.mk
+include $(LOCAL_PATH)/content/result_codes_java.target.linux-x86.mk
+include $(LOCAL_PATH)/content/surface_jni_headers.target.linux-x86.mk
+include $(LOCAL_PATH)/content/surface_texture_jni_headers.target.linux-x86.mk
+include $(LOCAL_PATH)/crypto/crypto.target.linux-x86.mk
+include $(LOCAL_PATH)/google_apis/google_apis.target.linux-x86.mk
+include $(LOCAL_PATH)/gpu/command_buffer/gles2_utils.target.linux-x86.mk
+include $(LOCAL_PATH)/gpu/command_buffer_client.target.linux-x86.mk
+include $(LOCAL_PATH)/gpu/command_buffer_common.target.linux-x86.mk
+include $(LOCAL_PATH)/gpu/command_buffer_service.target.linux-x86.mk
+include $(LOCAL_PATH)/gpu/disk_cache_proto.target.linux-x86.mk
+include $(LOCAL_PATH)/gpu/gles2_c_lib.target.linux-x86.mk
+include $(LOCAL_PATH)/gpu/gles2_cmd_helper.target.linux-x86.mk
+include $(LOCAL_PATH)/gpu/gles2_implementation.target.linux-x86.mk
+include $(LOCAL_PATH)/gpu/gpu.target.linux-x86.mk
+include $(LOCAL_PATH)/gpu/gpu_ipc.target.linux-x86.mk
+include $(LOCAL_PATH)/ipc/ipc.target.linux-x86.mk
+include $(LOCAL_PATH)/jingle/jingle_glue.target.linux-x86.mk
+include $(LOCAL_PATH)/media/media.target.linux-x86.mk
+include $(LOCAL_PATH)/media/media_android_jni_headers.target.linux-x86.mk
+include $(LOCAL_PATH)/media/media_codec_jni_headers.target.linux-x86.mk
+include $(LOCAL_PATH)/media/media_format_jni_headers.target.linux-x86.mk
+include $(LOCAL_PATH)/media/media_player_jni_headers.target.linux-x86.mk
+include $(LOCAL_PATH)/media/media_sse.target.linux-x86.mk
+include $(LOCAL_PATH)/media/player_android.target.linux-x86.mk
+include $(LOCAL_PATH)/media/shared_memory_support.target.linux-x86.mk
+include $(LOCAL_PATH)/media/video_capture_android_jni_headers.target.linux-x86.mk
+include $(LOCAL_PATH)/media/yuv_convert.target.linux-x86.mk
+include $(LOCAL_PATH)/media/yuv_convert_simd_x86.target.linux-x86.mk
+include $(LOCAL_PATH)/net/cert_verify_result_android_java.target.linux-x86.mk
+include $(LOCAL_PATH)/net/certificate_mime_types_java.target.linux-x86.mk
+include $(LOCAL_PATH)/net/http_server.target.linux-x86.mk
+include $(LOCAL_PATH)/net/net.target.linux-x86.mk
+include $(LOCAL_PATH)/net/net_errors_java.target.linux-x86.mk
+include $(LOCAL_PATH)/net/net_jni_headers.target.linux-x86.mk
+include $(LOCAL_PATH)/net/net_resources.target.linux-x86.mk
+include $(LOCAL_PATH)/net/private_key_types_java.target.linux-x86.mk
+include $(LOCAL_PATH)/ppapi/ppapi_c.target.linux-x86.mk
+include $(LOCAL_PATH)/ppapi/ppapi_shared.target.linux-x86.mk
+include $(LOCAL_PATH)/printing/printing.target.linux-x86.mk
+include $(LOCAL_PATH)/sandbox/sandbox.target.linux-x86.mk
+include $(LOCAL_PATH)/sandbox/sandbox_services.target.linux-x86.mk
+include $(LOCAL_PATH)/sandbox/sandbox_services_headers.target.linux-x86.mk
+include $(LOCAL_PATH)/sandbox/seccomp_bpf.target.linux-x86.mk
+include $(LOCAL_PATH)/sdch/sdch.target.linux-x86.mk
+include $(LOCAL_PATH)/skia/skia.target.linux-x86.mk
+include $(LOCAL_PATH)/skia/skia_opts.target.linux-x86.mk
+include $(LOCAL_PATH)/sql/sql.target.linux-x86.mk
+include $(LOCAL_PATH)/testing/gtest_prod.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/JavaScriptCore/JavaScriptCore.gyp/yarr.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/Platform/Platform.gyp/webkit_platform.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/ThirdParty/glu/libtess.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WTF/WTF.gyp/wtf.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WTF/WTF.gyp/wtf_config.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/debugger_script_source.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/generate_inspector_protocol_version.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/generate_settings.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/generate_supplemental_dependency.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/injected_canvas_script_source.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/injected_script_source.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/inspector_overlay_page.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/inspector_protocol_sources.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/webcore.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/webcore_bindings.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/webcore_bindings_sources.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/webcore_dom.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/webcore_html.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/webcore_platform.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/webcore_platform_geometry.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/webcore_prerequisites.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/webcore_remaining.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/webcore_rendering.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebCore/WebCore.gyp/webcore_svg.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/concatenated_devtools_ace_editor_js.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/concatenated_devtools_audits_js.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/concatenated_devtools_codemirror_js.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/concatenated_devtools_css.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/concatenated_devtools_elements_js.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/concatenated_devtools_js.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/concatenated_devtools_network_js.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/concatenated_devtools_profiles_js.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/concatenated_devtools_resources_js.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/concatenated_devtools_scripts_js.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/concatenated_devtools_timeline_js.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/concatenated_heap_snapshot_worker_js.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/concatenated_script_formatter_worker_js.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/devtools_extension_api.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/devtools_html.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/generate_devtools_grd.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/skia_webkit.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/webkit.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/webkit_wtf_support.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/angle/src/preprocessor.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/angle/src/translator_common.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/angle/src/translator_glsl.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/ashmem/ashmem.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/expat/expat.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/freetype/ft2.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/harfbuzz-ng/harfbuzz-ng.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/hyphen/hyphen.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/iccjpeg/iccjpeg.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/icu/icudata.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/icu/icui18n.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/icu/icuuc.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/icu/system_icu.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/khronos/khronos_headers.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/leveldatabase/leveldatabase.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/libevent/libevent.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/libjingle/libjingle.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/libjingle/libjingle_p2p_constants.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/libjpeg/libjpeg.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/libphonenumber/libphonenumber.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/libphonenumber/libphonenumber_without_metadata.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/libpng/libpng.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/libwebp/libwebp.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/libwebp/libwebp_dec.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/libwebp/libwebp_demux.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/libwebp/libwebp_dsp.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/libwebp/libwebp_dsp_neon.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/libwebp/libwebp_enc.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/libwebp/libwebp_utils.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/libxml/libxml.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/libxslt/libxslt.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/mesa/mesa_headers.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/modp_b64/modp_b64.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/npapi/npapi.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/openssl/openssl.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/opus/opus.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/ots/ots.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/protobuf/protobuf_full_do_not_use.host.linux-x86.mk
+include $(LOCAL_PATH)/third_party/protobuf/protobuf_lite.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/protobuf/protoc.host.linux-x86.mk
+include $(LOCAL_PATH)/third_party/qcms/qcms.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/re2/re2.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/smhasher/cityhash.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/sqlite/sqlite.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/v8-i18n/build/api2c.host.linux-x86.mk
+include $(LOCAL_PATH)/third_party/v8-i18n/build/v8-i18n.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/widevine/cdm/widevine_cdm_version_h.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/yasm/config_sources.host.linux-x86.mk
+include $(LOCAL_PATH)/third_party/yasm/generate_files.host.linux-x86.mk
+include $(LOCAL_PATH)/third_party/yasm/genmacro.host.linux-x86.mk
+include $(LOCAL_PATH)/third_party/yasm/genmodule.host.linux-x86.mk
+include $(LOCAL_PATH)/third_party/yasm/genperf.host.linux-x86.mk
+include $(LOCAL_PATH)/third_party/yasm/genperf_libs.host.linux-x86.mk
+include $(LOCAL_PATH)/third_party/yasm/genstring.host.linux-x86.mk
+include $(LOCAL_PATH)/third_party/yasm/genversion.host.linux-x86.mk
+include $(LOCAL_PATH)/third_party/yasm/re2c.host.linux-x86.mk
+include $(LOCAL_PATH)/third_party/yasm/yasm.host.linux-x86.mk
+include $(LOCAL_PATH)/third_party/zlib/zlib.target.linux-x86.mk
+include $(LOCAL_PATH)/ui/base/strings/ui_strings.target.linux-x86.mk
+include $(LOCAL_PATH)/ui/gl/gl.target.linux-x86.mk
+include $(LOCAL_PATH)/ui/native_theme/native_theme.target.linux-x86.mk
+include $(LOCAL_PATH)/ui/shell_dialogs.target.linux-x86.mk
+include $(LOCAL_PATH)/ui/snapshot/snapshot.target.linux-x86.mk
+include $(LOCAL_PATH)/ui/surface/surface.target.linux-x86.mk
+include $(LOCAL_PATH)/ui/ui.target.linux-x86.mk
+include $(LOCAL_PATH)/ui/ui_jni_headers.target.linux-x86.mk
+include $(LOCAL_PATH)/ui/ui_resources.target.linux-x86.mk
+include $(LOCAL_PATH)/v8/tools/gyp/js2c.host.linux-x86.mk
+include $(LOCAL_PATH)/v8/tools/gyp/mksnapshot.host.linux-x86.mk
+include $(LOCAL_PATH)/v8/tools/gyp/v8.target.linux-x86.mk
+include $(LOCAL_PATH)/v8/tools/gyp/v8_base.host.linux-x86.mk
+include $(LOCAL_PATH)/v8/tools/gyp/v8_base.target.linux-x86.mk
+include $(LOCAL_PATH)/v8/tools/gyp/v8_nosnapshot.host.linux-x86.mk
+include $(LOCAL_PATH)/v8/tools/gyp/v8_snapshot.target.linux-x86.mk
+include $(LOCAL_PATH)/webkit/compositor_bindings/webkit_compositor_bindings.target.linux-x86.mk
+include $(LOCAL_PATH)/webkit/compositor_bindings/webkit_compositor_support.target.linux-x86.mk
+include $(LOCAL_PATH)/webkit/gpu/webkit_gpu.target.linux-x86.mk
+include $(LOCAL_PATH)/webkit/support/glue.target.linux-x86.mk
+include $(LOCAL_PATH)/webkit/support/overscroller_jni_headers.target.linux-x86.mk
+include $(LOCAL_PATH)/webkit/support/user_agent.target.linux-x86.mk
+include $(LOCAL_PATH)/webkit/support/webkit_base.target.linux-x86.mk
+include $(LOCAL_PATH)/webkit/support/webkit_media.target.linux-x86.mk
+include $(LOCAL_PATH)/webkit/support/webkit_resources.target.linux-x86.mk
+include $(LOCAL_PATH)/webkit/support/webkit_storage.target.linux-x86.mk
+include $(LOCAL_PATH)/webkit/support/webkit_strings.target.linux-x86.mk
+include $(LOCAL_PATH)/webkit/support/webkit_version.target.linux-x86.mk
+
+# "gyp_all_modules" is a concatenation of the "gyp_all_modules" targets from
+# all the included sub-makefiles. This is just here to clarify.
+gyp_all_modules: