diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-05-14 12:12:37 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-05-14 12:12:37 +0100 |
| commit | 010d83a9304c5a91596085d917d248abff47903a (patch) | |
| tree | 41ef1a01862f352f9653c7a9cfa817abefe2cce2 /GypAndroid.linux-arm.mk | |
| parent | 08c107de54178bb0990a09adec724924e8bc9486 (diff) | |
| download | chromium_org-010d83a9304c5a91596085d917d248abff47903a.tar.gz | |
Merge from Chromium at DEPS revision 269336
This commit was generated by merge_to_master.py.
Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
Diffstat (limited to 'GypAndroid.linux-arm.mk')
| -rw-r--r-- | GypAndroid.linux-arm.mk | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/GypAndroid.linux-arm.mk b/GypAndroid.linux-arm.mk index 04c45bbd8c..875b5651f1 100644 --- a/GypAndroid.linux-arm.mk +++ b/GypAndroid.linux-arm.mk @@ -31,8 +31,13 @@ include $(LOCAL_PATH)/components/autofill_core_browser.target.linux-arm.mk include $(LOCAL_PATH)/components/autofill_core_common.target.linux-arm.mk include $(LOCAL_PATH)/components/autofill_jni_headers.target.linux-arm.mk include $(LOCAL_PATH)/components/autofill_regexes.target.linux-arm.mk +include $(LOCAL_PATH)/components/cdm_browser.target.linux-arm.mk +include $(LOCAL_PATH)/components/cdm_common.target.linux-arm.mk +include $(LOCAL_PATH)/components/cdm_renderer.target.linux-arm.mk include $(LOCAL_PATH)/components/components_resources.target.linux-arm.mk include $(LOCAL_PATH)/components/components_strings.target.linux-arm.mk +include $(LOCAL_PATH)/components/data_reduction_proxy_browser.target.linux-arm.mk +include $(LOCAL_PATH)/components/data_reduction_proxy_common.target.linux-arm.mk include $(LOCAL_PATH)/components/navigation_interception.target.linux-arm.mk include $(LOCAL_PATH)/components/navigation_interception_jni_headers.target.linux-arm.mk include $(LOCAL_PATH)/components/os_crypt.target.linux-arm.mk @@ -165,11 +170,13 @@ include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_profiler_module.t include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_resources_module.target.linux-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_script_formatter_worker_module.target.linux-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_search_module.target.linux-arm.mk +include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_settings_module.target.linux-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_source_frame_module.target.linux-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_sources_module.target.linux-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_temp_storage_shared_worker_module.target.linux-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_timeline_module.target.linux-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_css.target.linux-arm.mk +include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_module_descriptors.target.linux-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/devtools_extension_api.target.linux-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/devtools_frontend_resources.target.linux-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/devtools_html.target.linux-arm.mk @@ -192,8 +199,10 @@ include $(LOCAL_PATH)/third_party/WebKit/public/blink_headers.target.linux-arm.m include $(LOCAL_PATH)/third_party/WebKit/public/blink_minimal.target.linux-arm.mk include $(LOCAL_PATH)/third_party/WebKit/public/blink_skia_config.target.linux-arm.mk include $(LOCAL_PATH)/third_party/angle/src/commit_id.target.linux-arm.mk +include $(LOCAL_PATH)/third_party/angle/src/copy_scripts.target.linux-arm.mk include $(LOCAL_PATH)/third_party/angle/src/preprocessor.target.linux-arm.mk include $(LOCAL_PATH)/third_party/angle/src/translator.target.linux-arm.mk +include $(LOCAL_PATH)/third_party/angle/src/translator_lib.target.linux-arm.mk include $(LOCAL_PATH)/third_party/ashmem/ashmem.target.linux-arm.mk include $(LOCAL_PATH)/third_party/brotli/brotli.target.linux-arm.mk include $(LOCAL_PATH)/third_party/expat/expat.target.linux-arm.mk @@ -241,6 +250,8 @@ include $(LOCAL_PATH)/third_party/lzma_sdk/lzma_sdk.target.linux-arm.mk include $(LOCAL_PATH)/third_party/mesa/mesa_headers.target.linux-arm.mk include $(LOCAL_PATH)/third_party/modp_b64/modp_b64.target.linux-arm.mk include $(LOCAL_PATH)/third_party/npapi/npapi.target.linux-arm.mk +include $(LOCAL_PATH)/third_party/openmax_dl/dl/openmax_dl.target.linux-arm.mk +include $(LOCAL_PATH)/third_party/openmax_dl/dl/openmax_dl_armv7.target.linux-arm.mk include $(LOCAL_PATH)/third_party/openssl/openssl.target.linux-arm.mk include $(LOCAL_PATH)/third_party/opus/opus.target.linux-arm.mk include $(LOCAL_PATH)/third_party/ots/ots.target.linux-arm.mk |