mozilla
/
moz-skia
зеркало из https://github.com/mozilla/moz-skia.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Revert of Update skia to test with libpng to 1.6.10 (patchset #3 id:60001 of https://codereview.chromium.org/1301523005/ ) 

Reason for revert:
DM is failing on gm tests on Android bots.  Cause is not yet clear.

Original issue's description:
> Update skia to test with libpng to 1.6.10
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/f272bb03df9b86e7ea2cf23fb4d5cc56624e0118

TBR=djsollen@google.com,scroggo@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/1298223002
This commit is contained in:
msarett 2015-08-18 11:36:44 -07:00 коммит произвёл Commit bot
Родитель b1daa86732
Коммит 3011711d5d
2 изменённых файлов: 3 добавлений и 17 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
DEPS
Просмотреть файл

@ -27,7 +27,7 @@ deps = {
"platform_tools/android/third_party/externals/expat" : "https://android.googlesource.com/platform/external/expat.git@android-5.1.0_r3",
"platform_tools/android/third_party/externals/jpeg" : "https://android.googlesource.com/platform/external/jpeg.git@android-5.1.0_r3",
"platform_tools/android/third_party/externals/png" : "https://android.googlesource.com/platform/external/libpng.git@android-5.1.1_r13",
"platform_tools/android/third_party/externals/png" : "https://android.googlesource.com/platform/external/libpng.git@android-4.2.2_r1.2",
"platform_tools/chromeos/toolchain/src/third_party/chromite": "https://chromium.googlesource.com/chromiumos/chromite.git@d6a4c7e0ee4d53ddc5238dbddfc0417796a70e54",
"platform_tools/chromeos/toolchain/src/third_party/pyelftools": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git@bdc1d380acd88d4bfaf47265008091483b0d614e",

18
platform_tools/android/gyp/dependencies.gypi
Просмотреть файл

@ -94,6 +94,7 @@
'sources': [
'../third_party/externals/png/png.c',
'../third_party/externals/png/pngerror.c',
'../third_party/externals/png/pnggccrd.c',
'../third_party/externals/png/pngget.c',
'../third_party/externals/png/pngmem.c',
'../third_party/externals/png/pngpread.c',
@ -103,27 +104,12 @@
'../third_party/externals/png/pngrutil.c',
'../third_party/externals/png/pngset.c',
'../third_party/externals/png/pngtrans.c',
'../third_party/externals/png/pngvcrd.c',
'../third_party/externals/png/pngwio.c',
'../third_party/externals/png/pngwrite.c',
'../third_party/externals/png/pngwtran.c',
'../third_party/externals/png/pngwutil.c',
],
# TODO (msarett): Enable testing of Arm NEON opts.
# Currently we cannot compile because there is a namespace conflict with
# skia/third_party/externals/libpng.
#'conditions': [
# [ '("arm" in skia_arch_type) and (arm_version >= 7) and \
# (arm_neon == 1 or arm_neon_optional == 1)', {
# 'sources': [
# '../third_party/externals/png/arm/arm_init.c',
# '../third_party/externals/png/arm/filter_neon.S',
# '../third_party/externals/png/arm/filter_neon_intrinsics.c',
# ],
# 'cflags': [
# '-DPNG_ARM_NEON_OPT=2',
# ],
# }],
#],
'include_dirs': [
'../third_party/externals/png',
],