diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-08-05 13:57:33 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-08-05 13:57:33 +0100 |
| commit | a36e5920737c6adbddd3e43b760e5de8431db6e0 (patch) | |
| tree | 347d048bb8c8828d50113bf94ace40bf0613f2cd /GypAndroid.linux-arm.mk | |
| parent | 34378da0e9429d394aafdaa771301aff58447cb1 (diff) | |
| download | chromium_org-a36e5920737c6adbddd3e43b760e5de8431db6e0.tar.gz | |
Merge from Chromium at DEPS revision r215573
This commit was generated by merge_to_master.py.
Change-Id: Ib95814f98e5765b459dd32425f9bf9138edf2bca
Diffstat (limited to 'GypAndroid.linux-arm.mk')
| -rw-r--r-- | GypAndroid.linux-arm.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/GypAndroid.linux-arm.mk b/GypAndroid.linux-arm.mk index 22bb3ddf00..8517a4aa2e 100644 --- a/GypAndroid.linux-arm.mk +++ b/GypAndroid.linux-arm.mk @@ -105,8 +105,6 @@ include $(LOCAL_PATH)/skia/skia_opts.target.linux-arm.mk include $(LOCAL_PATH)/skia/skia_opts_neon.target.linux-arm.mk include $(LOCAL_PATH)/sql/sql.target.linux-arm.mk include $(LOCAL_PATH)/testing/gtest_prod.target.linux-arm.mk -include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/blink_common.target.linux-arm.mk -include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/webkit.target.linux-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/bindings_derived_sources.target.linux-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/deprecated_perl_bindings_sources.target.linux-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/interface_dependencies.target.linux-arm.mk @@ -149,6 +147,8 @@ include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/devtools_html.target.li include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/frontend_protocol_sources.target.linux-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/generate_devtools_grd.target.linux-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/modules/modules.target.linux-arm.mk +include $(LOCAL_PATH)/third_party/WebKit/Source/web/blink_common.target.linux-arm.mk +include $(LOCAL_PATH)/third_party/WebKit/Source/web/webkit.target.linux-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/weborigin/weborigin.target.linux-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/wtf/wtf.target.linux-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/wtf/wtf_config.target.linux-arm.mk @@ -161,7 +161,6 @@ include $(LOCAL_PATH)/third_party/ashmem/ashmem.target.linux-arm.mk include $(LOCAL_PATH)/third_party/expat/expat.target.linux-arm.mk include $(LOCAL_PATH)/third_party/freetype/ft2.target.linux-arm.mk include $(LOCAL_PATH)/third_party/harfbuzz-ng/harfbuzz-ng.target.linux-arm.mk -include $(LOCAL_PATH)/third_party/hyphen/hyphen.target.linux-arm.mk include $(LOCAL_PATH)/third_party/iccjpeg/iccjpeg.target.linux-arm.mk include $(LOCAL_PATH)/third_party/icu/icudata.host.linux-arm.mk include $(LOCAL_PATH)/third_party/icu/icudata.target.linux-arm.mk |