diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-10-18 15:46:22 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-10-18 15:46:22 +0100 |
| commit | 4e180b6a0b4720a9b8e9e959a882386f690f08ff (patch) | |
| tree | 788435d09362885908ba5ba9ef868b852ca82c0b /GypAndroid.darwin-mips.mk | |
| parent | 1179b92b08db0c652a0cf003ab4d89b31ce3610f (diff) | |
| download | chromium_org-4e180b6a0b4720a9b8e9e959a882386f690f08ff.tar.gz | |
Merge from Chromium at DEPS revision 228962
This commit was generated by merge_to_master.py.
Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
Diffstat (limited to 'GypAndroid.darwin-mips.mk')
| -rw-r--r-- | GypAndroid.darwin-mips.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/GypAndroid.darwin-mips.mk b/GypAndroid.darwin-mips.mk index 0121b43e7e..83577ebbb7 100644 --- a/GypAndroid.darwin-mips.mk +++ b/GypAndroid.darwin-mips.mk @@ -138,8 +138,9 @@ 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-mips.mk include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/generate_devtools_grd.target.darwin-mips.mk include $(LOCAL_PATH)/third_party/WebKit/Source/modules/modules.target.darwin-mips.mk +include $(LOCAL_PATH)/third_party/WebKit/Source/platform/blink_common.target.darwin-mips.mk include $(LOCAL_PATH)/third_party/WebKit/Source/platform/blink_platform.target.darwin-mips.mk -include $(LOCAL_PATH)/third_party/WebKit/Source/web/blink_common.target.darwin-mips.mk +include $(LOCAL_PATH)/third_party/WebKit/Source/web/picker_resources.target.darwin-mips.mk include $(LOCAL_PATH)/third_party/WebKit/Source/web/webkit.target.darwin-mips.mk include $(LOCAL_PATH)/third_party/WebKit/Source/weborigin/weborigin.target.darwin-mips.mk include $(LOCAL_PATH)/third_party/WebKit/Source/wtf/wtf.target.darwin-mips.mk @@ -148,8 +149,7 @@ include $(LOCAL_PATH)/third_party/WebKit/public/blink.target.darwin-mips.mk include $(LOCAL_PATH)/third_party/WebKit/public/blink_minimal.target.darwin-mips.mk include $(LOCAL_PATH)/third_party/WebKit/public/blink_skia_config.target.darwin-mips.mk include $(LOCAL_PATH)/third_party/angle_dx11/src/preprocessor.target.darwin-mips.mk -include $(LOCAL_PATH)/third_party/angle_dx11/src/translator_common.target.darwin-mips.mk -include $(LOCAL_PATH)/third_party/angle_dx11/src/translator_glsl.target.darwin-mips.mk +include $(LOCAL_PATH)/third_party/angle_dx11/src/translator.target.darwin-mips.mk include $(LOCAL_PATH)/third_party/ashmem/ashmem.target.darwin-mips.mk include $(LOCAL_PATH)/third_party/expat/expat.target.darwin-mips.mk include $(LOCAL_PATH)/third_party/freetype/ft2.target.darwin-mips.mk @@ -199,6 +199,9 @@ include $(LOCAL_PATH)/third_party/zlib/google/zip.target.darwin-mips.mk include $(LOCAL_PATH)/third_party/zlib/minizip.target.darwin-mips.mk include $(LOCAL_PATH)/third_party/zlib/zlib.target.darwin-mips.mk include $(LOCAL_PATH)/ui/base/strings/ui_strings.target.darwin-mips.mk +include $(LOCAL_PATH)/ui/events/events.target.darwin-mips.mk +include $(LOCAL_PATH)/ui/gfx/gfx.target.darwin-mips.mk +include $(LOCAL_PATH)/ui/gfx/gfx_jni_headers.target.darwin-mips.mk include $(LOCAL_PATH)/ui/gl/gl.target.darwin-mips.mk include $(LOCAL_PATH)/ui/gl/gl_jni_headers.target.darwin-mips.mk include $(LOCAL_PATH)/ui/gl/surface_jni_headers.target.darwin-mips.mk |