diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-10-31 11:16:26 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-10-31 11:16:26 +0000 |
| commit | 1e9bf3e0803691d0a228da41fc608347b6db4340 (patch) | |
| tree | ab2e5565f71b4219b3da406e19f16fe306704ef5 /GypAndroid.darwin-mips.mk | |
| parent | f10b58d5bc6ae3e74076fc4ccca14cbc57ef805c (diff) | |
| download | chromium_org-1e9bf3e0803691d0a228da41fc608347b6db4340.tar.gz | |
Merge from Chromium at DEPS revision 232015
This commit was generated by merge_to_master.py.
Change-Id: If86767ad396b9e2e1a4c1e9df1427daea29703ef
Diffstat (limited to 'GypAndroid.darwin-mips.mk')
| -rw-r--r-- | GypAndroid.darwin-mips.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/GypAndroid.darwin-mips.mk b/GypAndroid.darwin-mips.mk index b1b26b20bb..85ebb0b244 100644 --- a/GypAndroid.darwin-mips.mk +++ b/GypAndroid.darwin-mips.mk @@ -115,7 +115,6 @@ include $(LOCAL_PATH)/third_party/WebKit/Source/core/webcore_derived.target.darw include $(LOCAL_PATH)/third_party/WebKit/Source/core/webcore_dom.target.darwin-mips.mk include $(LOCAL_PATH)/third_party/WebKit/Source/core/webcore_html.target.darwin-mips.mk include $(LOCAL_PATH)/third_party/WebKit/Source/core/webcore_platform.target.darwin-mips.mk -include $(LOCAL_PATH)/third_party/WebKit/Source/core/webcore_platform_geometry.target.darwin-mips.mk include $(LOCAL_PATH)/third_party/WebKit/Source/core/webcore_prerequisites.target.darwin-mips.mk include $(LOCAL_PATH)/third_party/WebKit/Source/core/webcore_remaining.target.darwin-mips.mk include $(LOCAL_PATH)/third_party/WebKit/Source/core/webcore_rendering.target.darwin-mips.mk @@ -208,7 +207,7 @@ include $(LOCAL_PATH)/ui/gl/gl_jni_headers.target.darwin-mips.mk include $(LOCAL_PATH)/ui/gl/surface_jni_headers.target.darwin-mips.mk include $(LOCAL_PATH)/ui/keycode_converter.target.darwin-mips.mk include $(LOCAL_PATH)/ui/native_theme/native_theme.target.darwin-mips.mk -include $(LOCAL_PATH)/ui/shell_dialogs.target.darwin-mips.mk +include $(LOCAL_PATH)/ui/shell_dialogs/shell_dialogs.target.darwin-mips.mk include $(LOCAL_PATH)/ui/snapshot/snapshot.target.darwin-mips.mk include $(LOCAL_PATH)/ui/surface/surface.target.darwin-mips.mk include $(LOCAL_PATH)/ui/ui.target.darwin-mips.mk |