Merge from Chromium at DEPS revision 262940
This commit was generated by merge_to_master.py.
Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
diff --git a/GypAndroid.darwin-x86.mk b/GypAndroid.darwin-x86.mk
index 4112c11..790d86f 100644
--- a/GypAndroid.darwin-x86.mk
+++ b/GypAndroid.darwin-x86.mk
@@ -3,6 +3,7 @@
LOCAL_PATH := $(call my-dir)
GYP_CONFIGURATION ?= Debug
+GYP_VAR_PREFIX ?=
include $(LOCAL_PATH)/android_webview/android_webview_common.target.darwin-x86.mk
include $(LOCAL_PATH)/android_webview/android_webview_pak.target.darwin-x86.mk
@@ -50,6 +51,7 @@
include $(LOCAL_PATH)/content/content_browser.target.darwin-x86.mk
include $(LOCAL_PATH)/content/content_child.target.darwin-x86.mk
include $(LOCAL_PATH)/content/content_common.target.darwin-x86.mk
+include $(LOCAL_PATH)/content/content_common_mojo_bindings.target.darwin-x86.mk
include $(LOCAL_PATH)/content/content_gpu.target.darwin-x86.mk
include $(LOCAL_PATH)/content/content_jni_headers.target.darwin-x86.mk
include $(LOCAL_PATH)/content/content_renderer.target.darwin-x86.mk
@@ -93,6 +95,15 @@
include $(LOCAL_PATH)/media/shared_memory_support.target.darwin-x86.mk
include $(LOCAL_PATH)/media/shared_memory_support_sse.target.darwin-x86.mk
include $(LOCAL_PATH)/media/video_capture_android_jni_headers.target.darwin-x86.mk
+include $(LOCAL_PATH)/mojo/mojo_bindings.target.darwin-x86.mk
+include $(LOCAL_PATH)/mojo/mojo_common_lib.target.darwin-x86.mk
+include $(LOCAL_PATH)/mojo/mojo_environment_chromium.target.darwin-x86.mk
+include $(LOCAL_PATH)/mojo/mojo_environment_chromium_impl.target.darwin-x86.mk
+include $(LOCAL_PATH)/mojo/mojo_js_bindings_lib.target.darwin-x86.mk
+include $(LOCAL_PATH)/mojo/mojo_service_manager.target.darwin-x86.mk
+include $(LOCAL_PATH)/mojo/mojo_shell_bindings.target.darwin-x86.mk
+include $(LOCAL_PATH)/mojo/mojo_system.target.darwin-x86.mk
+include $(LOCAL_PATH)/mojo/mojo_system_impl.target.darwin-x86.mk
include $(LOCAL_PATH)/net/cert_verify_status_android_java.target.darwin-x86.mk
include $(LOCAL_PATH)/net/certificate_mime_types_java.target.darwin-x86.mk
include $(LOCAL_PATH)/net/http_server.target.darwin-x86.mk
@@ -155,6 +166,7 @@
include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_profiles_js.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_resources_js.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_scripts_js.target.darwin-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_search_js.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_timeline_js.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_heap_snapshot_worker_js.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_script_formatter_worker_js.target.darwin-x86.mk
@@ -164,10 +176,9 @@
include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/frontend_protocol_sources.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/generate_devtools_grd.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/supported_css_properties.target.darwin-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/heap/blink_heap.target.darwin-x86.mk
-include $(LOCAL_PATH)/third_party/WebKit/Source/heap/blink_heap_asm_stubs.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/modules/modules.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/platform/blink_common.target.darwin-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/platform/blink_heap_asm_stubs.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/platform/blink_platform.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/platform/blink_prerequisites.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/platform/make_platform_generated.target.darwin-x86.mk