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 /GypAndroid.linux-arm.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 'GypAndroid.linux-arm.mk')
| -rw-r--r-- | GypAndroid.linux-arm.mk | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/GypAndroid.linux-arm.mk b/GypAndroid.linux-arm.mk index aab21631c3..739aeb23f3 100644 --- a/GypAndroid.linux-arm.mk +++ b/GypAndroid.linux-arm.mk @@ -19,7 +19,6 @@ include $(LOCAL_PATH)/base/base_java_memory_pressure_level_list.target.linux-arm include $(LOCAL_PATH)/base/base_jni_headers.target.linux-arm.mk include $(LOCAL_PATH)/base/base_prefs.target.linux-arm.mk include $(LOCAL_PATH)/base/base_static.target.linux-arm.mk -include $(LOCAL_PATH)/base/symbolize.target.linux-arm.mk include $(LOCAL_PATH)/base/third_party/dynamic_annotations/dynamic_annotations.target.linux-arm.mk include $(LOCAL_PATH)/cc/cc.target.linux-arm.mk include $(LOCAL_PATH)/components/auto_login_parser.target.linux-arm.mk @@ -58,7 +57,6 @@ include $(LOCAL_PATH)/content/content_renderer.target.linux-arm.mk include $(LOCAL_PATH)/content/content_resources.target.linux-arm.mk include $(LOCAL_PATH)/content/content_utility.target.linux-arm.mk include $(LOCAL_PATH)/content/content_worker.target.linux-arm.mk -include $(LOCAL_PATH)/content/generate_content_resources.target.linux-arm.mk include $(LOCAL_PATH)/content/java_set_jni_headers.target.linux-arm.mk include $(LOCAL_PATH)/content/page_transition_types_java.target.linux-arm.mk include $(LOCAL_PATH)/content/result_codes_java.target.linux-arm.mk @@ -80,7 +78,6 @@ include $(LOCAL_PATH)/ipc/ipc.target.linux-arm.mk include $(LOCAL_PATH)/jingle/jingle_glue.target.linux-arm.mk include $(LOCAL_PATH)/media/media.target.linux-arm.mk include $(LOCAL_PATH)/media/media_android_jni_headers.target.linux-arm.mk -include $(LOCAL_PATH)/media/media_player_jni_headers.target.linux-arm.mk include $(LOCAL_PATH)/media/player_android.target.linux-arm.mk include $(LOCAL_PATH)/media/shared_memory_support.target.linux-arm.mk include $(LOCAL_PATH)/media/video_capture_android_jni_headers.target.linux-arm.mk @@ -109,7 +106,9 @@ include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/blink_common.tar include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/skia_webkit.target.linux-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/webkit.target.linux-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/bindings_derived_sources.target.linux-arm.mk -include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/supplemental_dependencies.target.linux-arm.mk +include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/deprecated_perl_bindings_sources.target.linux-arm.mk +include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/interface_dependencies.target.linux-arm.mk +include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/python_bindings_sources.target.linux-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/config.target.linux-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/core/debugger_script_source.target.linux-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/core/generate_inspector_protocol_version.target.linux-arm.mk @@ -224,26 +223,25 @@ include $(LOCAL_PATH)/v8/tools/gyp/v8_base.arm.host.linux-arm.mk include $(LOCAL_PATH)/v8/tools/gyp/v8_base.arm.target.linux-arm.mk include $(LOCAL_PATH)/v8/tools/gyp/v8_nosnapshot.arm.host.linux-arm.mk include $(LOCAL_PATH)/v8/tools/gyp/v8_snapshot.target.linux-arm.mk -include $(LOCAL_PATH)/webkit/base/webkit_base.target.linux-arm.mk include $(LOCAL_PATH)/webkit/common/gpu/webkit_gpu.target.linux-arm.mk include $(LOCAL_PATH)/webkit/common/user_agent/user_agent.target.linux-arm.mk include $(LOCAL_PATH)/webkit/common/user_agent/webkit_version.target.linux-arm.mk +include $(LOCAL_PATH)/webkit/common/webkit_common.target.linux-arm.mk +include $(LOCAL_PATH)/webkit/glue/glue_common.target.linux-arm.mk include $(LOCAL_PATH)/webkit/plugins/plugins_common.target.linux-arm.mk include $(LOCAL_PATH)/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.linux-arm.mk include $(LOCAL_PATH)/webkit/renderer/compositor_bindings/webkit_compositor_support.target.linux-arm.mk +include $(LOCAL_PATH)/webkit/renderer/webkit_renderer.target.linux-arm.mk include $(LOCAL_PATH)/webkit/support/glue.target.linux-arm.mk include $(LOCAL_PATH)/webkit/support/glue_child.target.linux-arm.mk -include $(LOCAL_PATH)/webkit/support/glue_common.target.linux-arm.mk -include $(LOCAL_PATH)/webkit/support/glue_renderer.target.linux-arm.mk include $(LOCAL_PATH)/webkit/support/overscroller_jni_headers.target.linux-arm.mk include $(LOCAL_PATH)/webkit/support/plugins.target.linux-arm.mk -include $(LOCAL_PATH)/webkit/support/webkit_common.target.linux-arm.mk include $(LOCAL_PATH)/webkit/support/webkit_media.target.linux-arm.mk -include $(LOCAL_PATH)/webkit/support/webkit_resources.target.linux-arm.mk -include $(LOCAL_PATH)/webkit/support/webkit_strings.target.linux-arm.mk +include $(LOCAL_PATH)/webkit/webkit_resources.target.linux-arm.mk include $(LOCAL_PATH)/webkit/webkit_storage_browser.target.linux-arm.mk include $(LOCAL_PATH)/webkit/webkit_storage_common.target.linux-arm.mk include $(LOCAL_PATH)/webkit/webkit_storage_renderer.target.linux-arm.mk +include $(LOCAL_PATH)/webkit/webkit_strings.target.linux-arm.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. |