diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-06-19 11:58:07 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-06-19 11:58:07 +0100 |
| commit | 7d4cd473f85ac64c3747c96c277f9e506a0d2246 (patch) | |
| tree | f5fecd524f5ac22cd38bcc6713b81f666730d5a1 /GypAndroid.darwin-arm.mk | |
| parent | 84f2b2352908c30e40ae12ffe850dd8470f6c048 (diff) | |
| download | chromium_org-7d4cd473f85ac64c3747c96c277f9e506a0d2246.tar.gz | |
Merge from Chromium at DEPS revision r207203
This commit was generated by merge_to_master.py.
Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
Diffstat (limited to 'GypAndroid.darwin-arm.mk')
| -rw-r--r-- | GypAndroid.darwin-arm.mk | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/GypAndroid.darwin-arm.mk b/GypAndroid.darwin-arm.mk index d57d9bc292..1a82330fe4 100644 --- a/GypAndroid.darwin-arm.mk +++ b/GypAndroid.darwin-arm.mk @@ -15,6 +15,7 @@ include $(LOCAL_PATH)/base/allocator/allocator_extension_thunks.target.darwin-ar include $(LOCAL_PATH)/base/base.target.darwin-arm.mk include $(LOCAL_PATH)/base/base_i18n.target.darwin-arm.mk include $(LOCAL_PATH)/base/base_java_activity_state.target.darwin-arm.mk +include $(LOCAL_PATH)/base/base_java_memory_pressure_level_list.target.darwin-arm.mk include $(LOCAL_PATH)/base/base_jni_headers.target.darwin-arm.mk include $(LOCAL_PATH)/base/base_prefs.target.darwin-arm.mk include $(LOCAL_PATH)/base/base_static.target.darwin-arm.mk @@ -24,12 +25,12 @@ include $(LOCAL_PATH)/build/temp_gyp/googleurl.target.darwin-arm.mk include $(LOCAL_PATH)/cc/cc.target.darwin-arm.mk include $(LOCAL_PATH)/components/auto_login_parser.target.darwin-arm.mk include $(LOCAL_PATH)/components/autofill_browser.target.darwin-arm.mk -include $(LOCAL_PATH)/components/autofill_common.target.darwin-arm.mk include $(LOCAL_PATH)/components/autofill_content_browser.target.darwin-arm.mk include $(LOCAL_PATH)/components/autofill_content_risk_proto.target.darwin-arm.mk +include $(LOCAL_PATH)/components/autofill_core_common.target.darwin-arm.mk include $(LOCAL_PATH)/components/autofill_jni_headers.target.darwin-arm.mk include $(LOCAL_PATH)/components/autofill_regexes.target.darwin-arm.mk -include $(LOCAL_PATH)/components/component_resources.target.darwin-arm.mk +include $(LOCAL_PATH)/components/component_strings.target.darwin-arm.mk include $(LOCAL_PATH)/components/encryptor.target.darwin-arm.mk include $(LOCAL_PATH)/components/navigation_interception.target.darwin-arm.mk include $(LOCAL_PATH)/components/navigation_interception_jni_headers.target.darwin-arm.mk @@ -61,6 +62,7 @@ include $(LOCAL_PATH)/content/generate_content_resources.target.darwin-arm.mk include $(LOCAL_PATH)/content/java_set_jni_headers.target.darwin-arm.mk include $(LOCAL_PATH)/content/page_transition_types_java.target.darwin-arm.mk include $(LOCAL_PATH)/content/result_codes_java.target.darwin-arm.mk +include $(LOCAL_PATH)/content/speech_recognition_error_java.target.darwin-arm.mk include $(LOCAL_PATH)/crypto/crypto.target.darwin-arm.mk include $(LOCAL_PATH)/google_apis/google_apis.target.darwin-arm.mk include $(LOCAL_PATH)/gpu/command_buffer/gles2_utils.target.darwin-arm.mk @@ -100,8 +102,10 @@ include $(LOCAL_PATH)/sandbox/seccomp_bpf.target.darwin-arm.mk include $(LOCAL_PATH)/sdch/sdch.target.darwin-arm.mk include $(LOCAL_PATH)/skia/skia.target.darwin-arm.mk include $(LOCAL_PATH)/skia/skia_opts.target.darwin-arm.mk +include $(LOCAL_PATH)/skia/skia_opts_neon.target.darwin-arm.mk include $(LOCAL_PATH)/sql/sql.target.darwin-arm.mk include $(LOCAL_PATH)/testing/gtest_prod.target.darwin-arm.mk +include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/blink_common.target.darwin-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/skia_webkit.target.darwin-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/WebKit/chromium/webkit.target.darwin-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/bindings_derived_sources.target.darwin-arm.mk @@ -148,9 +152,10 @@ include $(LOCAL_PATH)/third_party/WebKit/Source/weborigin/weborigin.target.darwi include $(LOCAL_PATH)/third_party/WebKit/Source/wtf/wtf.target.darwin-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/wtf/wtf_config.target.darwin-arm.mk include $(LOCAL_PATH)/third_party/WebKit/public/blink.target.darwin-arm.mk -include $(LOCAL_PATH)/third_party/angle/src/preprocessor.target.darwin-arm.mk -include $(LOCAL_PATH)/third_party/angle/src/translator_common.target.darwin-arm.mk -include $(LOCAL_PATH)/third_party/angle/src/translator_glsl.target.darwin-arm.mk +include $(LOCAL_PATH)/third_party/WebKit/public/blink_minimal.target.darwin-arm.mk +include $(LOCAL_PATH)/third_party/angle_dx11/src/preprocessor.target.darwin-arm.mk +include $(LOCAL_PATH)/third_party/angle_dx11/src/translator_common.target.darwin-arm.mk +include $(LOCAL_PATH)/third_party/angle_dx11/src/translator_glsl.target.darwin-arm.mk include $(LOCAL_PATH)/third_party/ashmem/ashmem.target.darwin-arm.mk include $(LOCAL_PATH)/third_party/expat/expat.target.darwin-arm.mk include $(LOCAL_PATH)/third_party/freetype/ft2.target.darwin-arm.mk @@ -227,6 +232,7 @@ include $(LOCAL_PATH)/webkit/plugins/plugins_common.target.darwin-arm.mk include $(LOCAL_PATH)/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.darwin-arm.mk include $(LOCAL_PATH)/webkit/renderer/compositor_bindings/webkit_compositor_support.target.darwin-arm.mk include $(LOCAL_PATH)/webkit/support/glue.target.darwin-arm.mk +include $(LOCAL_PATH)/webkit/support/glue_child.target.darwin-arm.mk include $(LOCAL_PATH)/webkit/support/glue_common.target.darwin-arm.mk include $(LOCAL_PATH)/webkit/support/glue_renderer.target.darwin-arm.mk include $(LOCAL_PATH)/webkit/support/overscroller_jni_headers.target.darwin-arm.mk |