diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-24 10:36:34 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-24 10:36:34 +0100 |
| commit | a3f7b4e666c476898878fa745f637129375cd889 (patch) | |
| tree | 1d78b48780e4c8603c226fd88d8f4b786f00bb81 /GypAndroid.darwin-x86.mk | |
| parent | d4336a7d5c149891bede0c3201c8e831520067af (diff) | |
| download | chromium_org-a3f7b4e666c476898878fa745f637129375cd889.tar.gz | |
Merge from Chromium at DEPS revision r213371
This commit was generated by merge_to_master.py.
Change-Id: I35a74205de4bff52a2dd6b15330f8a002a39efaf
Diffstat (limited to 'GypAndroid.darwin-x86.mk')
| -rw-r--r-- | GypAndroid.darwin-x86.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/GypAndroid.darwin-x86.mk b/GypAndroid.darwin-x86.mk index 05e4f61f23..a5088ab9ac 100644 --- a/GypAndroid.darwin-x86.mk +++ b/GypAndroid.darwin-x86.mk @@ -103,6 +103,9 @@ include $(LOCAL_PATH)/sandbox/sandbox_services_headers.target.darwin-x86.mk include $(LOCAL_PATH)/sandbox/seccomp_bpf.target.darwin-x86.mk include $(LOCAL_PATH)/sdch/sdch.target.darwin-x86.mk include $(LOCAL_PATH)/skia/skia.target.darwin-x86.mk +include $(LOCAL_PATH)/skia/skia_chrome.target.darwin-x86.mk +include $(LOCAL_PATH)/skia/skia_chrome_opts.target.darwin-x86.mk +include $(LOCAL_PATH)/skia/skia_library.target.darwin-x86.mk include $(LOCAL_PATH)/skia/skia_opts.target.darwin-x86.mk include $(LOCAL_PATH)/sql/sql.target.darwin-x86.mk include $(LOCAL_PATH)/testing/gtest_prod.target.darwin-x86.mk @@ -240,7 +243,6 @@ include $(LOCAL_PATH)/webkit/common/gpu/webkit_gpu.target.darwin-x86.mk include $(LOCAL_PATH)/webkit/common/user_agent/user_agent.target.darwin-x86.mk include $(LOCAL_PATH)/webkit/common/user_agent/webkit_version.target.darwin-x86.mk include $(LOCAL_PATH)/webkit/common/webkit_common.target.darwin-x86.mk -include $(LOCAL_PATH)/webkit/glue/glue_common.target.darwin-x86.mk include $(LOCAL_PATH)/webkit/plugins/plugins_common.target.darwin-x86.mk include $(LOCAL_PATH)/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.darwin-x86.mk include $(LOCAL_PATH)/webkit/renderer/compositor_bindings/webkit_compositor_support.target.darwin-x86.mk @@ -249,7 +251,6 @@ include $(LOCAL_PATH)/webkit/support/glue.target.darwin-x86.mk include $(LOCAL_PATH)/webkit/support/glue_child.target.darwin-x86.mk include $(LOCAL_PATH)/webkit/support/overscroller_jni_headers.target.darwin-x86.mk include $(LOCAL_PATH)/webkit/support/plugins.target.darwin-x86.mk -include $(LOCAL_PATH)/webkit/support/webkit_media.target.darwin-x86.mk include $(LOCAL_PATH)/webkit/webkit_resources.target.darwin-x86.mk include $(LOCAL_PATH)/webkit/webkit_storage_browser.target.darwin-x86.mk include $(LOCAL_PATH)/webkit/webkit_storage_common.target.darwin-x86.mk |