diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-05-13 16:52:09 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-05-13 16:52:09 +0100 |
| commit | b2df76ea8fec9e32f6f3718986dba0d95315b29c (patch) | |
| tree | 0182623e854b794f7307829abf4be16435a0193a /GypAndroid.darwin-x86.mk | |
| parent | 121d6d4bf5931d9b1dbc0b9a262f6c609440f6c7 (diff) | |
| download | chromium_org-b2df76ea8fec9e32f6f3718986dba0d95315b29c.tar.gz | |
Merge from Chromium at DEPS revision r199464
This commit was generated by merge_to_master.py.
Change-Id: Ic3d1f97a4fb4edd1e6ed66a70b5040da1622b5a9
Diffstat (limited to 'GypAndroid.darwin-x86.mk')
| -rw-r--r-- | GypAndroid.darwin-x86.mk | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/GypAndroid.darwin-x86.mk b/GypAndroid.darwin-x86.mk index fa9ae8d62c..48cf950391 100644 --- a/GypAndroid.darwin-x86.mk +++ b/GypAndroid.darwin-x86.mk @@ -22,7 +22,14 @@ include $(LOCAL_PATH)/base/symbolize.target.darwin-x86.mk include $(LOCAL_PATH)/base/third_party/dynamic_annotations/dynamic_annotations.target.darwin-x86.mk include $(LOCAL_PATH)/build/temp_gyp/googleurl.target.darwin-x86.mk include $(LOCAL_PATH)/cc/cc.target.darwin-x86.mk +include $(LOCAL_PATH)/chrome/chrome_strings.target.darwin-x86.mk include $(LOCAL_PATH)/components/auto_login_parser.target.darwin-x86.mk +include $(LOCAL_PATH)/components/autofill_browser.target.darwin-x86.mk +include $(LOCAL_PATH)/components/autofill_common.target.darwin-x86.mk +include $(LOCAL_PATH)/components/autofill_jni_headers.target.darwin-x86.mk +include $(LOCAL_PATH)/components/autofill_regexes.target.darwin-x86.mk +include $(LOCAL_PATH)/components/autofill_risk_proto.target.darwin-x86.mk +include $(LOCAL_PATH)/components/encryptor.target.darwin-x86.mk include $(LOCAL_PATH)/components/navigation_interception.target.darwin-x86.mk include $(LOCAL_PATH)/components/navigation_interception_jni_headers.target.darwin-x86.mk include $(LOCAL_PATH)/components/tracing.target.darwin-x86.mk @@ -31,6 +38,7 @@ include $(LOCAL_PATH)/components/visitedlink_common.target.darwin-x86.mk include $(LOCAL_PATH)/components/visitedlink_renderer.target.darwin-x86.mk include $(LOCAL_PATH)/components/web_contents_delegate_android.target.darwin-x86.mk include $(LOCAL_PATH)/components/web_contents_delegate_android_jni_headers.target.darwin-x86.mk +include $(LOCAL_PATH)/components/webdata_common.target.darwin-x86.mk include $(LOCAL_PATH)/content/browser/devtools/devtools_resources.target.darwin-x86.mk include $(LOCAL_PATH)/content/browser/speech/proto/speech_proto.target.darwin-x86.mk include $(LOCAL_PATH)/content/common_aidl.target.darwin-x86.mk @@ -104,7 +112,7 @@ include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/supplemental_dependenci include $(LOCAL_PATH)/third_party/WebKit/Source/config.target.darwin-x86.mk include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/debugger_script_source.target.darwin-x86.mk include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/generate_inspector_protocol_version.target.darwin-x86.mk -include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/generate_settings.target.darwin-x86.mk +include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/generate_test_support_idls.target.darwin-x86.mk include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/injected_canvas_script_source.target.darwin-x86.mk include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/injected_script_source.target.darwin-x86.mk include $(LOCAL_PATH)/third_party/WebKit/Source/core/core.gyp/inspector_overlay_page.target.darwin-x86.mk @@ -137,6 +145,7 @@ include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/devtools_html.target.da 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/modules/modules.target.darwin-x86.mk +include $(LOCAL_PATH)/third_party/WebKit/Source/origin/origin.target.darwin-x86.mk include $(LOCAL_PATH)/third_party/WebKit/Source/wtf/wtf.target.darwin-x86.mk include $(LOCAL_PATH)/third_party/WebKit/Source/wtf/wtf_config.target.darwin-x86.mk include $(LOCAL_PATH)/third_party/angle/src/preprocessor.target.darwin-x86.mk |