diff options
| author | Ben Murdoch <benm@google.com> | 2014-08-29 15:08:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-29 15:08:40 +0000 |
| commit | d62cf37b162966945a24a2df2ff28fbb2878fbe0 (patch) | |
| tree | b3896b54b1673da1929ee50d6dec875efb3ae788 /android_webview | |
| parent | 7f4b47ae7f809492ba848276590e749c1a4c7bc0 (diff) | |
| parent | c1942b189965ab0a2086aa6de64d966e9e16fe6b (diff) | |
| download | chromium_org-d62cf37b162966945a24a2df2ff28fbb2878fbe0.tar.gz | |
Merge "Merge WebP at 0.4.1-rc1, plus MIPS build fixes." into lmp-dev
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/libwebviewchromium.target.darwin-arm64.mk | 3 | ||||
| -rw-r--r-- | android_webview/libwebviewchromium.target.linux-arm64.mk | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/android_webview/libwebviewchromium.target.darwin-arm64.mk b/android_webview/libwebviewchromium.target.darwin-arm64.mk index 29179286f5..22f11bcc3f 100644 --- a/android_webview/libwebviewchromium.target.darwin-arm64.mk +++ b/android_webview/libwebviewchromium.target.darwin-arm64.mk @@ -137,7 +137,7 @@ GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,GYP,third_party_libwebp_libwebp_gyp,,,$(GYP_VAR_PREFIX))/webp.stamp \ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libwebp_libwebp_dec_gyp,,,$(GYP_VAR_PREFIX))/third_party_libwebp_libwebp_dec_gyp.a \ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libwebp_libwebp_dsp_gyp,,,$(GYP_VAR_PREFIX))/third_party_libwebp_libwebp_dsp_gyp.a \ - $(call intermediates-dir-for,GYP,third_party_libwebp_libwebp_dsp_neon_gyp,,,$(GYP_VAR_PREFIX))/libwebp_dsp_neon.stamp \ + $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libwebp_libwebp_dsp_neon_gyp,,,$(GYP_VAR_PREFIX))/third_party_libwebp_libwebp_dsp_neon_gyp.a \ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libwebp_libwebp_utils_gyp,,,$(GYP_VAR_PREFIX))/third_party_libwebp_libwebp_utils_gyp.a \ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libwebp_libwebp_demux_gyp,,,$(GYP_VAR_PREFIX))/third_party_libwebp_libwebp_demux_gyp.a \ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libwebp_libwebp_enc_gyp,,,$(GYP_VAR_PREFIX))/third_party_libwebp_libwebp_enc_gyp.a \ @@ -678,6 +678,7 @@ LOCAL_STATIC_LIBRARIES := \ third_party_WebKit_Source_platform_blink_heap_asm_stubs_gyp \ third_party_libwebp_libwebp_dec_gyp \ third_party_libwebp_libwebp_dsp_gyp \ + third_party_libwebp_libwebp_dsp_neon_gyp \ third_party_libwebp_libwebp_utils_gyp \ third_party_libwebp_libwebp_demux_gyp \ third_party_libwebp_libwebp_enc_gyp \ diff --git a/android_webview/libwebviewchromium.target.linux-arm64.mk b/android_webview/libwebviewchromium.target.linux-arm64.mk index 29179286f5..22f11bcc3f 100644 --- a/android_webview/libwebviewchromium.target.linux-arm64.mk +++ b/android_webview/libwebviewchromium.target.linux-arm64.mk @@ -137,7 +137,7 @@ GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,GYP,third_party_libwebp_libwebp_gyp,,,$(GYP_VAR_PREFIX))/webp.stamp \ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libwebp_libwebp_dec_gyp,,,$(GYP_VAR_PREFIX))/third_party_libwebp_libwebp_dec_gyp.a \ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libwebp_libwebp_dsp_gyp,,,$(GYP_VAR_PREFIX))/third_party_libwebp_libwebp_dsp_gyp.a \ - $(call intermediates-dir-for,GYP,third_party_libwebp_libwebp_dsp_neon_gyp,,,$(GYP_VAR_PREFIX))/libwebp_dsp_neon.stamp \ + $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libwebp_libwebp_dsp_neon_gyp,,,$(GYP_VAR_PREFIX))/third_party_libwebp_libwebp_dsp_neon_gyp.a \ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libwebp_libwebp_utils_gyp,,,$(GYP_VAR_PREFIX))/third_party_libwebp_libwebp_utils_gyp.a \ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libwebp_libwebp_demux_gyp,,,$(GYP_VAR_PREFIX))/third_party_libwebp_libwebp_demux_gyp.a \ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libwebp_libwebp_enc_gyp,,,$(GYP_VAR_PREFIX))/third_party_libwebp_libwebp_enc_gyp.a \ @@ -678,6 +678,7 @@ LOCAL_STATIC_LIBRARIES := \ third_party_WebKit_Source_platform_blink_heap_asm_stubs_gyp \ third_party_libwebp_libwebp_dec_gyp \ third_party_libwebp_libwebp_dsp_gyp \ + third_party_libwebp_libwebp_dsp_neon_gyp \ third_party_libwebp_libwebp_utils_gyp \ third_party_libwebp_libwebp_demux_gyp \ third_party_libwebp_libwebp_enc_gyp \ |