diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-05-15 11:34:50 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-05-15 11:34:50 +0100 |
| commit | a93a17c8d99d686bd4a1511e5504e5e6cc9fcadf (patch) | |
| tree | 2fc96923f36ddec68fee218d79dd407c28fa46f8 /GypAndroid.darwin-x86.mk | |
| parent | 770489ea635fbf896c1ace4db0d08d6981a2db8b (diff) | |
| download | chromium_org-a93a17c8d99d686bd4a1511e5504e5e6cc9fcadf.tar.gz | |
Merge from Chromium at DEPS revision r200144
This commit was generated by merge_to_master.py.
Change-Id: I85f3a249ae157fd8253431215fb2dfcd12ee9bf3
Diffstat (limited to 'GypAndroid.darwin-x86.mk')
| -rw-r--r-- | GypAndroid.darwin-x86.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/GypAndroid.darwin-x86.mk b/GypAndroid.darwin-x86.mk index 48cf950391..85550fa0f8 100644 --- a/GypAndroid.darwin-x86.mk +++ b/GypAndroid.darwin-x86.mk @@ -22,13 +22,13 @@ 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/component_resources.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 @@ -145,7 +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/weborigin/weborigin.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 |