Remove Chromium backports that are not longer needed
This commit is contained in:
Aleksei Kuzmin
Родитель
8c1e703ead
Коммит
1eb8618056
|
|
@ -229,30 +229,6 @@ patches:
|
|||
owners: deepak1556
|
||||
file: latency_histogram_macros.patch
|
||||
description: null
|
||||
-
|
||||
owners: alexeykuzmin
|
||||
file: backport_140d82d6f8e2.patch
|
||||
description: null
|
||||
-
|
||||
owners: alexeykuzmin
|
||||
file: backport_4dfcf263240a.patch
|
||||
description: null
|
||||
-
|
||||
owners: alexeykuzmin
|
||||
file: backport_81e7f1791035.patch
|
||||
description: null
|
||||
-
|
||||
owners: alexeykuzmin
|
||||
file: backport_99b48b47f11f.patch
|
||||
description: null
|
||||
-
|
||||
owners: alexeykuzmin
|
||||
file: backport_1ed08ea9dbb0.patch
|
||||
description: null
|
||||
-
|
||||
owners: alexeykuzmin
|
||||
file: backport_97f5f9df6988.patch
|
||||
description: null
|
||||
-
|
||||
owners: alexeykuzmin
|
||||
file: add_atomic_lib_to_dependencies_even_for_sysroot_builds.patch
|
||||
|
|
@ -261,26 +237,14 @@ patches:
|
|||
owners: zcbenz
|
||||
file: gin_enable_disable_v8_platform.patch
|
||||
description: null
|
||||
-
|
||||
owners: alexeykuzmin
|
||||
file: backport_015a8b82b8e1.patch
|
||||
description: null
|
||||
-
|
||||
owners: deepak1556
|
||||
file: disable-recursive-surface-sync.patch
|
||||
description: null
|
||||
-
|
||||
owners: alexeykuzmin
|
||||
file: backport_a6977980088b.patch
|
||||
description: null
|
||||
-
|
||||
owners: null
|
||||
file: can_disable_desktop_capture_throttling.patch
|
||||
description: null
|
||||
-
|
||||
owners: alexeykuzmin
|
||||
file: backport_72f0a9302524.patch
|
||||
description: null
|
||||
-
|
||||
owners: codebytere
|
||||
file: patch_catalog_vuln.patch
|
||||
|
|
@ -293,32 +257,6 @@ patches:
|
|||
This changes the catalog manifest to move the capability to a
|
||||
different more specific capability, and updates two of its
|
||||
consumers.
|
||||
-
|
||||
owners: alexeykuzmin
|
||||
file: backport_22c1deb1bcd1.patch
|
||||
description: null
|
||||
-
|
||||
owners: null
|
||||
file: fix-touchpad-lagging-issue.patch
|
||||
description: |
|
||||
Fixes the touchpad lagging issue: https://crbug.com/713907, https://crbug.com/793036.
|
||||
Backported from https://crrev.com/c/867070.
|
||||
-
|
||||
owners: alexeykuzmin
|
||||
file: backport_ea2ad20b708c.patch
|
||||
description: null
|
||||
-
|
||||
owners: alexeykuzmin
|
||||
file: backport_d3131378a4ef.patch
|
||||
description: null
|
||||
-
|
||||
owners: alexeykuzmin
|
||||
file: backport_1d39d46571bb.patch
|
||||
description: null
|
||||
-
|
||||
owners: gavignus
|
||||
file: backport_c1690d3.patch
|
||||
description: Fixes build with VS 2017. Landed in 64.0.3242.0.
|
||||
-
|
||||
owners: deepak1556
|
||||
file: blink-worker-enable-csp-in-file-scheme.patch
|
||||
|
|
|
|||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
|
@ -1,14 +0,0 @@
|
|||
140d82d6f8e2aba78c45ef74317678cb54a29dde
|
||||
diff --git a/build/linux/sysroot_scripts/sysroot-creator.sh b/build/linux/sysroot_scripts/sysroot-creator.sh
|
||||
index cf984516e4c9..87720e50997b 100644
|
||||
--- a/build/linux/sysroot_scripts/sysroot-creator.sh
|
||||
+++ b/build/linux/sysroot_scripts/sysroot-creator.sh
|
||||
@@ -184,7 +184,7 @@ ClearInstallDir() {
|
||||
|
||||
CreateTarBall() {
|
||||
Banner "Creating tarball ${TARBALL}"
|
||||
- tar Jcf ${TARBALL} -C ${INSTALL_ROOT} .
|
||||
+ tar -I "xz -9 -T0" -cf ${TARBALL} -C ${INSTALL_ROOT} .
|
||||
}
|
||||
|
||||
ExtractPackageGz() {
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
1d39d46571bbca555e8cfa090dac19c1f8c09fcf
|
||||
diff --git a/build/linux/sysroot_scripts/install-sysroot.py b/build/linux/sysroot_scripts/install-sysroot.py
|
||||
index fe01daa67451..2a7918bb075a 100755
|
||||
--- a/build/linux/sysroot_scripts/install-sysroot.py
|
||||
+++ b/build/linux/sysroot_scripts/install-sysroot.py
|
||||
@@ -39,7 +39,7 @@ import gyp_environment
|
||||
URL_PREFIX = 'https://commondatastorage.googleapis.com'
|
||||
URL_PATH = 'chrome-linux-sysroot/toolchain'
|
||||
|
||||
-VALID_ARCHS = ('arm', 'arm64', 'i386', 'amd64', 'mips')
|
||||
+VALID_ARCHS = ('arm', 'arm64', 'i386', 'amd64', 'mips', 'mips64el')
|
||||
|
||||
|
||||
class Error(Exception):
|
||||
@@ -72,6 +72,8 @@ def DetectHostArch():
|
||||
return 'arm64'
|
||||
if detected_host_arch == 'mips':
|
||||
return 'mips'
|
||||
+ if detected_host_arch == 'mips64':
|
||||
+ return 'mips64el'
|
||||
if detected_host_arch == 'ppc':
|
||||
return 'ppc'
|
||||
if detected_host_arch == 's390':
|
||||
@@ -101,6 +103,8 @@ def DetectTargetArch():
|
||||
return 'arm64'
|
||||
if target_arch == 'mipsel':
|
||||
return 'mips'
|
||||
+ if target_arch == 'mips64el':
|
||||
+ return 'mips64el'
|
||||
|
||||
return None
|
||||
|
||||
|
|
@ -1,210 +0,0 @@
|
|||
1ed08ea9dbb0ce745e974f8a541259a4e8a6a82a
|
||||
diff --git a/build/linux/sysroot_scripts/sysroot-creator.sh b/build/linux/sysroot_scripts/sysroot-creator.sh
|
||||
index c4b56ab8eef4..aeba9bcf5ae5 100644
|
||||
--- a/build/linux/sysroot_scripts/sysroot-creator.sh
|
||||
+++ b/build/linux/sysroot_scripts/sysroot-creator.sh
|
||||
@@ -280,24 +280,27 @@ VerifyPackageFilesMatch() {
|
||||
#
|
||||
######################################################################
|
||||
|
||||
-HacksAndPatchesAmd64() {
|
||||
+HacksAndPatchesCommon() {
|
||||
+ local arch=$1
|
||||
+ local os=$2
|
||||
+ local strip=$3
|
||||
Banner "Misc Hacks & Patches"
|
||||
# these are linker scripts with absolute pathnames in them
|
||||
# which we rewrite here
|
||||
- lscripts="${INSTALL_ROOT}/usr/lib/x86_64-linux-gnu/libpthread.so \
|
||||
- ${INSTALL_ROOT}/usr/lib/x86_64-linux-gnu/libc.so"
|
||||
+ lscripts="${INSTALL_ROOT}/usr/lib/${arch}-${os}/libpthread.so \
|
||||
+ ${INSTALL_ROOT}/usr/lib/${arch}-${os}/libc.so"
|
||||
|
||||
# Rewrite linker scripts
|
||||
- sed -i -e 's|/usr/lib/x86_64-linux-gnu/||g' ${lscripts}
|
||||
- sed -i -e 's|/lib/x86_64-linux-gnu/||g' ${lscripts}
|
||||
+ sed -i -e 's|/usr/lib/${arch}-${os}/||g' ${lscripts}
|
||||
+ sed -i -e 's|/lib/${arch}-${os}/||g' ${lscripts}
|
||||
|
||||
# Unversion libdbus symbols. This is required because libdbus-1-3
|
||||
# switched from unversioned symbols to versioned ones, and we must
|
||||
# still support distros using the unversioned library. This hack
|
||||
# can be removed once support for Ubuntu Trusty and Debian Jessie
|
||||
# are dropped.
|
||||
- strip -R .gnu.version_d -R .gnu.version \
|
||||
- "${INSTALL_ROOT}/lib/x86_64-linux-gnu/libdbus-1.so.3"
|
||||
+ ${strip} -R .gnu.version_d -R .gnu.version \
|
||||
+ "${INSTALL_ROOT}/lib/${arch}-${os}/libdbus-1.so.3"
|
||||
cp "${SCRIPT_DIR}/libdbus-1-3-symbols" \
|
||||
"${INSTALL_ROOT}/debian/libdbus-1-3/DEBIAN/symbols"
|
||||
|
||||
@@ -305,157 +308,38 @@ HacksAndPatchesAmd64() {
|
||||
# which overwrites PKG_CONFIG_LIBDIR internally
|
||||
SubBanner "Move pkgconfig scripts"
|
||||
mkdir -p ${INSTALL_ROOT}/usr/lib/pkgconfig
|
||||
- mv ${INSTALL_ROOT}/usr/lib/x86_64-linux-gnu/pkgconfig/* \
|
||||
+ mv ${INSTALL_ROOT}/usr/lib/${arch}-${os}/pkgconfig/* \
|
||||
${INSTALL_ROOT}/usr/lib/pkgconfig
|
||||
}
|
||||
|
||||
|
||||
-HacksAndPatchesI386() {
|
||||
- Banner "Misc Hacks & Patches"
|
||||
- # these are linker scripts with absolute pathnames in them
|
||||
- # which we rewrite here
|
||||
- lscripts="${INSTALL_ROOT}/usr/lib/i386-linux-gnu/libpthread.so \
|
||||
- ${INSTALL_ROOT}/usr/lib/i386-linux-gnu/libc.so"
|
||||
-
|
||||
- # Rewrite linker scripts
|
||||
- sed -i -e 's|/usr/lib/i386-linux-gnu/||g' ${lscripts}
|
||||
- sed -i -e 's|/lib/i386-linux-gnu/||g' ${lscripts}
|
||||
+HacksAndPatchesAmd64() {
|
||||
+ HacksAndPatchesCommon x86_64 linux-gnu strip
|
||||
+}
|
||||
|
||||
- # Unversion libdbus symbols. This is required because libdbus-1-3
|
||||
- # switched from unversioned symbols to versioned ones, and we must
|
||||
- # still support distros using the unversioned library. This hack
|
||||
- # can be removed once support for Ubuntu Trusty and Debian Jessie
|
||||
- # are dropped.
|
||||
- strip -R .gnu.version_d -R .gnu.version \
|
||||
- "${INSTALL_ROOT}/lib/i386-linux-gnu/libdbus-1.so.3"
|
||||
- cp "${SCRIPT_DIR}/libdbus-1-3-symbols" \
|
||||
- "${INSTALL_ROOT}/debian/libdbus-1-3/DEBIAN/symbols"
|
||||
|
||||
- # This is for chrome's ./build/linux/pkg-config-wrapper
|
||||
- # which overwrites PKG_CONFIG_LIBDIR internally
|
||||
- SubBanner "Move pkgconfig scripts"
|
||||
- mkdir -p ${INSTALL_ROOT}/usr/lib/pkgconfig
|
||||
- mv ${INSTALL_ROOT}/usr/lib/i386-linux-gnu/pkgconfig/* \
|
||||
- ${INSTALL_ROOT}/usr/lib/pkgconfig
|
||||
+HacksAndPatchesI386() {
|
||||
+ HacksAndPatchesCommon i386 linux-gnu strip
|
||||
}
|
||||
|
||||
|
||||
HacksAndPatchesARM() {
|
||||
- Banner "Misc Hacks & Patches"
|
||||
- # these are linker scripts with absolute pathnames in them
|
||||
- # which we rewrite here
|
||||
- lscripts="${INSTALL_ROOT}/usr/lib/arm-linux-gnueabihf/libpthread.so \
|
||||
- ${INSTALL_ROOT}/usr/lib/arm-linux-gnueabihf/libc.so"
|
||||
-
|
||||
- # Rewrite linker scripts
|
||||
- sed -i -e 's|/usr/lib/arm-linux-gnueabihf/||g' ${lscripts}
|
||||
- sed -i -e 's|/lib/arm-linux-gnueabihf/||g' ${lscripts}
|
||||
-
|
||||
- # Unversion libdbus symbols. This is required because libdbus-1-3
|
||||
- # switched from unversioned symbols to versioned ones, and we must
|
||||
- # still support distros using the unversioned library. This hack
|
||||
- # can be removed once support for Ubuntu Trusty and Debian Jessie
|
||||
- # are dropped.
|
||||
- arm-linux-gnueabihf-strip -R .gnu.version_d -R .gnu.version \
|
||||
- "${INSTALL_ROOT}/lib/arm-linux-gnueabihf/libdbus-1.so.3"
|
||||
- cp "${SCRIPT_DIR}/libdbus-1-3-symbols" \
|
||||
- "${INSTALL_ROOT}/debian/libdbus-1-3/DEBIAN/symbols"
|
||||
-
|
||||
- # This is for chrome's ./build/linux/pkg-config-wrapper
|
||||
- # which overwrites PKG_CONFIG_LIBDIR internally
|
||||
- SubBanner "Move pkgconfig files"
|
||||
- mkdir -p ${INSTALL_ROOT}/usr/lib/pkgconfig
|
||||
- mv ${INSTALL_ROOT}/usr/lib/arm-linux-gnueabihf/pkgconfig/* \
|
||||
- ${INSTALL_ROOT}/usr/lib/pkgconfig
|
||||
+ HacksAndPatchesCommon arm linux-gnueabihf arm-linux-gnueabihf-strip
|
||||
}
|
||||
|
||||
-HacksAndPatchesARM64() {
|
||||
- Banner "Misc Hacks & Patches"
|
||||
- # these are linker scripts with absolute pathnames in them
|
||||
- # which we rewrite here
|
||||
- lscripts="${INSTALL_ROOT}/usr/lib/aarch64-linux-gnu/libpthread.so \
|
||||
- ${INSTALL_ROOT}/usr/lib/aarch64-linux-gnu/libc.so"
|
||||
-
|
||||
- # Rewrite linker scripts
|
||||
- sed -i -e 's|/usr/lib/aarch64-linux-gnu/||g' ${lscripts}
|
||||
- sed -i -e 's|/lib/aarch64-linux-gnu/||g' ${lscripts}
|
||||
-
|
||||
- # Unversion libdbus symbols. This is required because libdbus-1-3
|
||||
- # switched from unversioned symbols to versioned ones, and we must
|
||||
- # still support distros using the unversioned library. This hack
|
||||
- # can be removed once support for Ubuntu Trusty and Debian Jessie
|
||||
- # are dropped.
|
||||
- aarch64-linux-gnu-strip -R .gnu.version_d -R .gnu.version \
|
||||
- "${INSTALL_ROOT}/lib/aarch64-linux-gnu/libdbus-1.so.3"
|
||||
- cp "${SCRIPT_DIR}/libdbus-1-3-symbols" \
|
||||
- "${INSTALL_ROOT}/debian/libdbus-1-3/DEBIAN/symbols"
|
||||
-
|
||||
- # This is for chrome's ./build/linux/pkg-config-wrapper
|
||||
- # which overwrites PKG_CONFIG_LIBDIR internally
|
||||
- SubBanner "Move pkgconfig files"
|
||||
- mkdir -p ${INSTALL_ROOT}/usr/lib/pkgconfig
|
||||
- mv ${INSTALL_ROOT}/usr/lib/aarch64-linux-gnu/pkgconfig/* \
|
||||
- ${INSTALL_ROOT}/usr/lib/pkgconfig
|
||||
|
||||
+HacksAndPatchesARM64() {
|
||||
+ HacksAndPatchesCommon aarch64 linux-gnu aarch64-linux-gnu-strip
|
||||
}
|
||||
|
||||
-HacksAndPatchesMips() {
|
||||
- Banner "Misc Hacks & Patches"
|
||||
- # these are linker scripts with absolute pathnames in them
|
||||
- # which we rewrite here
|
||||
- lscripts="${INSTALL_ROOT}/usr/lib/mipsel-linux-gnu/libpthread.so \
|
||||
- ${INSTALL_ROOT}/usr/lib/mipsel-linux-gnu/libc.so"
|
||||
-
|
||||
- # Rewrite linker scripts
|
||||
- sed -i -e 's|/usr/lib/mipsel-linux-gnu/||g' ${lscripts}
|
||||
- sed -i -e 's|/lib/mipsel-linux-gnu/||g' ${lscripts}
|
||||
-
|
||||
- # Unversion libdbus symbols. This is required because libdbus-1-3
|
||||
- # switched from unversioned symbols to versioned ones, and we must
|
||||
- # still support distros using the unversioned library. This hack
|
||||
- # can be removed once support for Ubuntu Trusty and Debian Jessie
|
||||
- # are dropped.
|
||||
- mipsel-linux-gnu-strip -R .gnu.version_d -R .gnu.version \
|
||||
- "${INSTALL_ROOT}/lib/mipsel-linux-gnu/libdbus-1.so.3"
|
||||
- cp "${SCRIPT_DIR}/libdbus-1-3-symbols" \
|
||||
- "${INSTALL_ROOT}/debian/libdbus-1-3/DEBIAN/symbols"
|
||||
|
||||
- # This is for chrome's ./build/linux/pkg-config-wrapper
|
||||
- # which overwrites PKG_CONFIG_LIBDIR internally
|
||||
- SubBanner "Move pkgconfig files"
|
||||
- mkdir -p ${INSTALL_ROOT}/usr/lib/pkgconfig
|
||||
- mv ${INSTALL_ROOT}/usr/lib/mipsel-linux-gnu/pkgconfig/* \
|
||||
- ${INSTALL_ROOT}/usr/lib/pkgconfig
|
||||
+HacksAndPatchesMips() {
|
||||
+ HacksAndPatchesCommon mipsel linux-gnu mipsel-linux-gnu-strip
|
||||
}
|
||||
|
||||
|
||||
HacksAndPatchesMips64el() {
|
||||
- Banner "Misc Hacks & Patches"
|
||||
- # these are linker scripts with absolute pathnames in them
|
||||
- # which we rewrite here
|
||||
- lscripts="${INSTALL_ROOT}/usr/lib/mips64el-linux-gnuabi64/libpthread.so \
|
||||
- ${INSTALL_ROOT}/usr/lib/mips64el-linux-gnuabi64/libc.so"
|
||||
-
|
||||
- # Rewrite linker scripts
|
||||
- sed -i -e 's|/usr/lib/mips64el-linux-gnuabi64/||g' ${lscripts}
|
||||
- sed -i -e 's|/lib/mips64el-linux-gnuabi64/||g' ${lscripts}
|
||||
-
|
||||
- # Unversion libdbus symbols. This is required because libdbus-1-3
|
||||
- # switched from unversioned symbols to versioned ones, and we must
|
||||
- # still support distros using the unversioned library. This hack
|
||||
- # can be removed once support for Ubuntu Trusty and Debian Jessie
|
||||
- # are dropped.
|
||||
- mips64el-linux-gnuabi64-strip -R .gnu.version_d -R .gnu.version \
|
||||
- "${INSTALL_ROOT}/lib/mips64el-linux-gnuabi64/libdbus-1.so.3"
|
||||
- cp "${SCRIPT_DIR}/libdbus-1-3-symbols" \
|
||||
- "${INSTALL_ROOT}/debian/libdbus-1-3/DEBIAN/symbols"
|
||||
-
|
||||
- # This is for chrome's ./build/linux/pkg-config-wrapper
|
||||
- # which overwrites PKG_CONFIG_LIBDIR internally
|
||||
- SubBanner "Move pkgconfig files"
|
||||
- mkdir -p ${INSTALL_ROOT}/usr/lib/pkgconfig
|
||||
- mv ${INSTALL_ROOT}/usr/lib/mips64el-linux-gnuabi64/pkgconfig/* \
|
||||
- ${INSTALL_ROOT}/usr/lib/pkgconfig
|
||||
+ HacksAndPatchesCommon mips64el linux-gnuabi64 mips64el-linux-gnuabi64-strip
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1,113 +0,0 @@
|
|||
22c1deb1bcd167edb53c7986aab6d6f8f262a892
|
||||
diff --git a/build/linux/sysroot_scripts/sysroot-creator.sh b/build/linux/sysroot_scripts/sysroot-creator.sh
|
||||
index 0f3ee70b9506..d041578aa088 100644
|
||||
--- a/build/linux/sysroot_scripts/sysroot-creator.sh
|
||||
+++ b/build/linux/sysroot_scripts/sysroot-creator.sh
|
||||
@@ -420,6 +420,59 @@ CleanupJailSymlinks() {
|
||||
cd "$SAVEDPWD"
|
||||
}
|
||||
|
||||
+
|
||||
+VerifyLibraryDepsCommon() {
|
||||
+ local arch=$1
|
||||
+ local os=$2
|
||||
+ local find_dirs=(
|
||||
+ "${INSTALL_ROOT}/lib/${arch}-${os}/"
|
||||
+ "${INSTALL_ROOT}/usr/lib/${arch}-${os}/"
|
||||
+ )
|
||||
+ local needed_libs="$(
|
||||
+ find ${find_dirs[*]} -name "*\.so*" -type f -exec file {} \; | \
|
||||
+ grep ': ELF' | sed 's/^\(.*\): .*$/\1/' | xargs readelf -d | \
|
||||
+ grep NEEDED | sort | uniq | sed 's/^.*Shared library: \[\(.*\)\]$/\1/g')"
|
||||
+ local all_libs="$(find ${find_dirs[*]} -printf '%f\n')"
|
||||
+ local missing_libs="$(grep -vFxf <(echo "${all_libs}") \
|
||||
+ <(echo "${needed_libs}"))"
|
||||
+ if [ ! -z "${missing_libs}" ]; then
|
||||
+ echo "Missing libraries:"
|
||||
+ echo "${missing_libs}"
|
||||
+ exit 1
|
||||
+ fi
|
||||
+}
|
||||
+
|
||||
+
|
||||
+VerifyLibraryDepsAmd64() {
|
||||
+ VerifyLibraryDepsCommon x86_64 linux-gnu
|
||||
+}
|
||||
+
|
||||
+
|
||||
+VerifyLibraryDepsI386() {
|
||||
+ VerifyLibraryDepsCommon i386 linux-gnu
|
||||
+}
|
||||
+
|
||||
+
|
||||
+VerifyLibraryDepsARM() {
|
||||
+ VerifyLibraryDepsCommon arm linux-gnueabihf
|
||||
+}
|
||||
+
|
||||
+
|
||||
+VerifyLibraryDepsARM64() {
|
||||
+ VerifyLibraryDepsCommon aarch64 linux-gnu
|
||||
+}
|
||||
+
|
||||
+
|
||||
+VerifyLibraryDepsMips() {
|
||||
+ VerifyLibraryDepsCommon mipsel linux-gnu
|
||||
+}
|
||||
+
|
||||
+
|
||||
+VerifyLibraryDepsMips64el() {
|
||||
+ VerifyLibraryDepsCommon mips64el linux-gnuabi64
|
||||
+}
|
||||
+
|
||||
+
|
||||
#@
|
||||
#@ BuildSysrootAmd64
|
||||
#@
|
||||
@@ -437,6 +490,7 @@ BuildSysrootAmd64() {
|
||||
InstallIntoSysroot ${files_and_sha256sums}
|
||||
CleanupJailSymlinks
|
||||
HacksAndPatchesAmd64
|
||||
+ VerifyLibraryDepsAmd64
|
||||
CreateTarBall
|
||||
}
|
||||
|
||||
@@ -457,6 +511,7 @@ BuildSysrootI386() {
|
||||
InstallIntoSysroot ${files_and_sha256sums}
|
||||
CleanupJailSymlinks
|
||||
HacksAndPatchesI386
|
||||
+ VerifyLibraryDepsI386
|
||||
CreateTarBall
|
||||
}
|
||||
|
||||
@@ -477,6 +532,7 @@ BuildSysrootARM() {
|
||||
InstallIntoSysroot ${files_and_sha256sums}
|
||||
CleanupJailSymlinks
|
||||
HacksAndPatchesARM
|
||||
+ VerifyLibraryDepsARM
|
||||
CreateTarBall
|
||||
}
|
||||
|
||||
@@ -497,6 +553,7 @@ BuildSysrootARM64() {
|
||||
InstallIntoSysroot ${files_and_sha256sums}
|
||||
CleanupJailSymlinks
|
||||
HacksAndPatchesARM64
|
||||
+ VerifyLibraryDepsARM64
|
||||
CreateTarBall
|
||||
}
|
||||
|
||||
@@ -518,6 +575,7 @@ BuildSysrootMips() {
|
||||
InstallIntoSysroot ${files_and_sha256sums}
|
||||
CleanupJailSymlinks
|
||||
HacksAndPatchesMips
|
||||
+ VerifyLibraryDepsMips
|
||||
CreateTarBall
|
||||
}
|
||||
|
||||
@@ -539,6 +597,7 @@ BuildSysrootMips64el() {
|
||||
InstallIntoSysroot ${files_and_sha256sums}
|
||||
CleanupJailSymlinks
|
||||
HacksAndPatchesMips64el
|
||||
+ VerifyLibraryDepsMips64el
|
||||
CreateTarBall
|
||||
}
|
||||
|
||||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
|
@ -1,31 +0,0 @@
|
|||
72f0a9302524579a14a6625fc30cf8377fc197e8
|
||||
diff --git a/build/linux/sysroot_scripts/sysroot-creator.sh b/build/linux/sysroot_scripts/sysroot-creator.sh
|
||||
index ef2759f9e009..0f3ee70b9506 100644
|
||||
--- a/build/linux/sysroot_scripts/sysroot-creator.sh
|
||||
+++ b/build/linux/sysroot_scripts/sysroot-creator.sh
|
||||
@@ -329,7 +329,9 @@ HacksAndPatchesARM() {
|
||||
|
||||
|
||||
HacksAndPatchesARM64() {
|
||||
- HacksAndPatchesCommon aarch64 linux-gnu aarch64-linux-gnu-strip
|
||||
+ # Use the unstripped libdbus for arm64 to prevent linker errors.
|
||||
+ # https://bugs.chromium.org/p/webrtc/issues/detail?id=8535
|
||||
+ HacksAndPatchesCommon aarch64 linux-gnu true
|
||||
}
|
||||
|
||||
|
||||
diff --git a/build/linux/sysroot_scripts/sysroots.json b/build/linux/sysroot_scripts/sysroots.json
|
||||
index 2e818f3033af..8478178b8dc3 100644
|
||||
--- a/build/linux/sysroot_scripts/sysroots.json
|
||||
+++ b/build/linux/sysroot_scripts/sysroots.json
|
||||
@@ -12,8 +12,8 @@
|
||||
"Tarball": "debian_stretch_arm_sysroot.tar.xz"
|
||||
},
|
||||
"stretch_arm64": {
|
||||
- "Revision": "2202c161310ffde63729f29d27fe7bb24a0bc540",
|
||||
- "Sha1Sum": "2649a7ffa2e0d9a42a9a567a33967ec706bd3b8e",
|
||||
+ "Revision": "62a209c44d63af015bfd7b2bccb3ec37b08686e3",
|
||||
+ "Sha1Sum": "f2e564cd96221820a0bd241d34158dfb24f6a220",
|
||||
"SysrootDir": "debian_stretch_arm64-sysroot",
|
||||
"Tarball": "debian_stretch_arm64_sysroot.tar.xz"
|
||||
},
|
||||
|
|
@ -1,383 +0,0 @@
|
|||
81e7f179103597820ffd01269c2740e8e8815b82
|
||||
diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh
|
||||
index 966a16e4d8a6..d87ab7f262ff 100755
|
||||
--- a/build/install-build-deps.sh
|
||||
+++ b/build/install-build-deps.sh
|
||||
@@ -348,8 +348,7 @@ case $distro_codename in
|
||||
# All necessary ARM packages are available on the default repos on
|
||||
# Debian 9 and later.
|
||||
*)
|
||||
- arm_list="binutils-aarch64-linux-gnu
|
||||
- libc6-dev-armhf-cross
|
||||
+ arm_list="libc6-dev-armhf-cross
|
||||
linux-libc-dev-armhf-cross
|
||||
${GPP_ARM_PACKAGE}"
|
||||
;;
|
||||
@@ -498,6 +497,20 @@ if package_exists appmenu-gtk; then
|
||||
lib_list="$lib_list appmenu-gtk"
|
||||
fi
|
||||
|
||||
+# Cross-toolchain strip is needed for building the sysroots.
|
||||
+if package_exists binutils-arm-linux-gnueabihf; then
|
||||
+ dev_list="${dev_list} binutils-arm-linux-gnueabihf"
|
||||
+fi
|
||||
+if package_exists binutils-aarch64-linux-gnu; then
|
||||
+ dev_list="${dev_list} binutils-aarch64-linux-gnu"
|
||||
+fi
|
||||
+if package_exists binutils-mipsel-linux-gnu; then
|
||||
+ dev_list="${dev_list} binutils-mipsel-linux-gnu"
|
||||
+fi
|
||||
+if package_exists binutils-mips64el-linux-gnuabi64; then
|
||||
+ dev_list="${dev_list} binutils-mips64el-linux-gnuabi64"
|
||||
+fi
|
||||
+
|
||||
# When cross building for arm/Android on 64-bit systems the host binaries
|
||||
# that are part of v8 need to be compiled with -m32 which means
|
||||
# that basic multilib support is needed.
|
||||
diff --git a/build/linux/sysroot_scripts/libdbus-1-3-symbols b/build/linux/sysroot_scripts/libdbus-1-3-symbols
|
||||
new file mode 100644
|
||||
index 000000000000..28050aa570a7
|
||||
--- /dev/null
|
||||
+++ b/build/linux/sysroot_scripts/libdbus-1-3-symbols
|
||||
@@ -0,0 +1,235 @@
|
||||
+libdbus-1.so.3 libdbus-1-3 #MINVER#
|
||||
+ dbus_address_entries_free@Base 1.0.2
|
||||
+ dbus_address_entry_get_method@Base 1.0.2
|
||||
+ dbus_address_entry_get_value@Base 1.0.2
|
||||
+ dbus_address_escape_value@Base 1.0.2
|
||||
+ dbus_address_unescape_value@Base 1.0.2
|
||||
+ dbus_bus_add_match@Base 1.0.2
|
||||
+ dbus_bus_get@Base 1.0.2
|
||||
+ dbus_bus_get_id@Base 1.1.1
|
||||
+ dbus_bus_get_private@Base 1.0.2
|
||||
+ dbus_bus_get_unique_name@Base 1.0.2
|
||||
+ dbus_bus_get_unix_user@Base 1.0.2
|
||||
+ dbus_bus_name_has_owner@Base 1.0.2
|
||||
+ dbus_bus_register@Base 1.0.2
|
||||
+ dbus_bus_release_name@Base 1.0.2
|
||||
+ dbus_bus_remove_match@Base 1.0.2
|
||||
+ dbus_bus_request_name@Base 1.0.2
|
||||
+ dbus_bus_set_unique_name@Base 1.0.2
|
||||
+ dbus_bus_start_service_by_name@Base 1.0.2
|
||||
+ dbus_connection_add_filter@Base 1.0.2
|
||||
+ dbus_connection_allocate_data_slot@Base 1.0.2
|
||||
+ dbus_connection_borrow_message@Base 1.0.2
|
||||
+ dbus_connection_can_send_type@Base 1.3.1
|
||||
+ dbus_connection_close@Base 1.0.2
|
||||
+ dbus_connection_dispatch@Base 1.0.2
|
||||
+ dbus_connection_flush@Base 1.0.2
|
||||
+ dbus_connection_free_data_slot@Base 1.0.2
|
||||
+ dbus_connection_free_preallocated_send@Base 1.0.2
|
||||
+ dbus_connection_get_adt_audit_session_data@Base 1.2.4
|
||||
+ dbus_connection_get_data@Base 1.0.2
|
||||
+ dbus_connection_get_dispatch_status@Base 1.0.2
|
||||
+ dbus_connection_get_is_anonymous@Base 1.1.1
|
||||
+ dbus_connection_get_is_authenticated@Base 1.0.2
|
||||
+ dbus_connection_get_is_connected@Base 1.0.2
|
||||
+ dbus_connection_get_max_message_size@Base 1.0.2
|
||||
+ dbus_connection_get_max_message_unix_fds@Base 1.3.1
|
||||
+ dbus_connection_get_max_received_size@Base 1.0.2
|
||||
+ dbus_connection_get_max_received_unix_fds@Base 1.3.1
|
||||
+ dbus_connection_get_object_path_data@Base 1.0.2
|
||||
+ dbus_connection_get_outgoing_size@Base 1.0.2
|
||||
+ dbus_connection_get_outgoing_unix_fds@Base 1.3.1
|
||||
+ dbus_connection_get_server_id@Base 1.1.1
|
||||
+ dbus_connection_get_socket@Base 1.0.2
|
||||
+ dbus_connection_get_unix_fd@Base 1.0.2
|
||||
+ dbus_connection_get_unix_process_id@Base 1.0.2
|
||||
+ dbus_connection_get_unix_user@Base 1.0.2
|
||||
+ dbus_connection_get_windows_user@Base 1.1.1
|
||||
+ dbus_connection_has_messages_to_send@Base 1.0.2
|
||||
+ dbus_connection_list_registered@Base 1.0.2
|
||||
+ dbus_connection_open@Base 1.0.2
|
||||
+ dbus_connection_open_private@Base 1.0.2
|
||||
+ dbus_connection_pop_message@Base 1.0.2
|
||||
+ dbus_connection_preallocate_send@Base 1.0.2
|
||||
+ dbus_connection_read_write@Base 1.0.2
|
||||
+ dbus_connection_read_write_dispatch@Base 1.0.2
|
||||
+ dbus_connection_ref@Base 1.0.2
|
||||
+ dbus_connection_register_fallback@Base 1.0.2
|
||||
+ dbus_connection_register_object_path@Base 1.0.2
|
||||
+ dbus_connection_remove_filter@Base 1.0.2
|
||||
+ dbus_connection_return_message@Base 1.0.2
|
||||
+ dbus_connection_send@Base 1.0.2
|
||||
+ dbus_connection_send_preallocated@Base 1.0.2
|
||||
+ dbus_connection_send_with_reply@Base 1.0.2
|
||||
+ dbus_connection_send_with_reply_and_block@Base 1.0.2
|
||||
+ dbus_connection_set_allow_anonymous@Base 1.1.1
|
||||
+ dbus_connection_set_change_sigpipe@Base 1.0.2
|
||||
+ dbus_connection_set_data@Base 1.0.2
|
||||
+ dbus_connection_set_dispatch_status_function@Base 1.0.2
|
||||
+ dbus_connection_set_exit_on_disconnect@Base 1.0.2
|
||||
+ dbus_connection_set_max_message_size@Base 1.0.2
|
||||
+ dbus_connection_set_max_message_unix_fds@Base 1.3.1
|
||||
+ dbus_connection_set_max_received_size@Base 1.0.2
|
||||
+ dbus_connection_set_max_received_unix_fds@Base 1.3.1
|
||||
+ dbus_connection_set_route_peer_messages@Base 1.0.2
|
||||
+ dbus_connection_set_timeout_functions@Base 1.0.2
|
||||
+ dbus_connection_set_unix_user_function@Base 1.0.2
|
||||
+ dbus_connection_set_wakeup_main_function@Base 1.0.2
|
||||
+ dbus_connection_set_watch_functions@Base 1.0.2
|
||||
+ dbus_connection_set_windows_user_function@Base 1.1.1
|
||||
+ dbus_connection_steal_borrowed_message@Base 1.0.2
|
||||
+ dbus_connection_try_register_fallback@Base 1.1.4
|
||||
+ dbus_connection_try_register_object_path@Base 1.1.4
|
||||
+ dbus_connection_unref@Base 1.0.2
|
||||
+ dbus_connection_unregister_object_path@Base 1.0.2
|
||||
+ dbus_error_free@Base 1.0.2
|
||||
+ dbus_error_has_name@Base 1.0.2
|
||||
+ dbus_error_init@Base 1.0.2
|
||||
+ dbus_error_is_set@Base 1.0.2
|
||||
+ dbus_free@Base 1.0.2
|
||||
+ dbus_free_string_array@Base 1.0.2
|
||||
+ dbus_get_local_machine_id@Base 1.0.2
|
||||
+ dbus_get_version@Base 1.1.4
|
||||
+ dbus_internal_do_not_use_create_uuid@Base 1.0.2
|
||||
+ dbus_internal_do_not_use_get_uuid@Base 1.0.2
|
||||
+ dbus_malloc0@Base 1.0.2
|
||||
+ dbus_malloc@Base 1.0.2
|
||||
+ dbus_message_allocate_data_slot@Base 1.0.2
|
||||
+ dbus_message_append_args@Base 1.0.2
|
||||
+ dbus_message_append_args_valist@Base 1.0.2
|
||||
+ dbus_message_contains_unix_fds@Base 1.3.1
|
||||
+ dbus_message_copy@Base 1.0.2
|
||||
+ dbus_message_demarshal@Base 1.1.1
|
||||
+ dbus_message_demarshal_bytes_needed@Base 1.2.14
|
||||
+ dbus_message_free_data_slot@Base 1.0.2
|
||||
+ dbus_message_get_args@Base 1.0.2
|
||||
+ dbus_message_get_args_valist@Base 1.0.2
|
||||
+ dbus_message_get_auto_start@Base 1.0.2
|
||||
+ dbus_message_get_data@Base 1.0.2
|
||||
+ dbus_message_get_destination@Base 1.0.2
|
||||
+ dbus_message_get_error_name@Base 1.0.2
|
||||
+ dbus_message_get_interface@Base 1.0.2
|
||||
+ dbus_message_get_member@Base 1.0.2
|
||||
+ dbus_message_get_no_reply@Base 1.0.2
|
||||
+ dbus_message_get_path@Base 1.0.2
|
||||
+ dbus_message_get_path_decomposed@Base 1.0.2
|
||||
+ dbus_message_get_reply_serial@Base 1.0.2
|
||||
+ dbus_message_get_sender@Base 1.0.2
|
||||
+ dbus_message_get_serial@Base 1.0.2
|
||||
+ dbus_message_get_signature@Base 1.0.2
|
||||
+ dbus_message_get_type@Base 1.0.2
|
||||
+ dbus_message_has_destination@Base 1.0.2
|
||||
+ dbus_message_has_interface@Base 1.0.2
|
||||
+ dbus_message_has_member@Base 1.0.2
|
||||
+ dbus_message_has_path@Base 1.0.2
|
||||
+ dbus_message_has_sender@Base 1.0.2
|
||||
+ dbus_message_has_signature@Base 1.0.2
|
||||
+ dbus_message_is_error@Base 1.0.2
|
||||
+ dbus_message_is_method_call@Base 1.0.2
|
||||
+ dbus_message_is_signal@Base 1.0.2
|
||||
+ dbus_message_iter_abandon_container@Base 1.2.16
|
||||
+ dbus_message_iter_append_basic@Base 1.0.2
|
||||
+ dbus_message_iter_append_fixed_array@Base 1.0.2
|
||||
+ dbus_message_iter_close_container@Base 1.0.2
|
||||
+ dbus_message_iter_get_arg_type@Base 1.0.2
|
||||
+ dbus_message_iter_get_array_len@Base 1.0.2
|
||||
+ dbus_message_iter_get_basic@Base 1.0.2
|
||||
+ dbus_message_iter_get_element_type@Base 1.0.2
|
||||
+ dbus_message_iter_get_fixed_array@Base 1.0.2
|
||||
+ dbus_message_iter_get_signature@Base 1.0.2
|
||||
+ dbus_message_iter_has_next@Base 1.0.2
|
||||
+ dbus_message_iter_init@Base 1.0.2
|
||||
+ dbus_message_iter_init_append@Base 1.0.2
|
||||
+ dbus_message_iter_next@Base 1.0.2
|
||||
+ dbus_message_iter_open_container@Base 1.0.2
|
||||
+ dbus_message_iter_recurse@Base 1.0.2
|
||||
+ dbus_message_lock@Base 1.2.14
|
||||
+ dbus_message_marshal@Base 1.1.1
|
||||
+ dbus_message_new@Base 1.0.2
|
||||
+ dbus_message_new_error@Base 1.0.2
|
||||
+ dbus_message_new_error_printf@Base 1.0.2
|
||||
+ dbus_message_new_method_call@Base 1.0.2
|
||||
+ dbus_message_new_method_return@Base 1.0.2
|
||||
+ dbus_message_new_signal@Base 1.0.2
|
||||
+ dbus_message_ref@Base 1.0.2
|
||||
+ dbus_message_set_auto_start@Base 1.0.2
|
||||
+ dbus_message_set_data@Base 1.0.2
|
||||
+ dbus_message_set_destination@Base 1.0.2
|
||||
+ dbus_message_set_error_name@Base 1.0.2
|
||||
+ dbus_message_set_interface@Base 1.0.2
|
||||
+ dbus_message_set_member@Base 1.0.2
|
||||
+ dbus_message_set_no_reply@Base 1.0.2
|
||||
+ dbus_message_set_path@Base 1.0.2
|
||||
+ dbus_message_set_reply_serial@Base 1.0.2
|
||||
+ dbus_message_set_sender@Base 1.0.2
|
||||
+ dbus_message_set_serial@Base 1.2.14
|
||||
+ dbus_message_type_from_string@Base 1.0.2
|
||||
+ dbus_message_type_to_string@Base 1.0.2
|
||||
+ dbus_message_unref@Base 1.0.2
|
||||
+ dbus_move_error@Base 1.0.2
|
||||
+ dbus_parse_address@Base 1.0.2
|
||||
+ dbus_pending_call_allocate_data_slot@Base 1.0.2
|
||||
+ dbus_pending_call_block@Base 1.0.2
|
||||
+ dbus_pending_call_cancel@Base 1.0.2
|
||||
+ dbus_pending_call_free_data_slot@Base 1.0.2
|
||||
+ dbus_pending_call_get_completed@Base 1.0.2
|
||||
+ dbus_pending_call_get_data@Base 1.0.2
|
||||
+ dbus_pending_call_ref@Base 1.0.2
|
||||
+ dbus_pending_call_set_data@Base 1.0.2
|
||||
+ dbus_pending_call_set_notify@Base 1.0.2
|
||||
+ dbus_pending_call_steal_reply@Base 1.0.2
|
||||
+ dbus_pending_call_unref@Base 1.0.2
|
||||
+ dbus_realloc@Base 1.0.2
|
||||
+ dbus_server_allocate_data_slot@Base 1.0.2
|
||||
+ dbus_server_disconnect@Base 1.0.2
|
||||
+ dbus_server_free_data_slot@Base 1.0.2
|
||||
+ dbus_server_get_address@Base 1.0.2
|
||||
+ dbus_server_get_data@Base 1.0.2
|
||||
+ dbus_server_get_id@Base 1.1.1
|
||||
+ dbus_server_get_is_connected@Base 1.0.2
|
||||
+ dbus_server_listen@Base 1.0.2
|
||||
+ dbus_server_ref@Base 1.0.2
|
||||
+ dbus_server_set_auth_mechanisms@Base 1.0.2
|
||||
+ dbus_server_set_data@Base 1.0.2
|
||||
+ dbus_server_set_new_connection_function@Base 1.0.2
|
||||
+ dbus_server_set_timeout_functions@Base 1.0.2
|
||||
+ dbus_server_set_watch_functions@Base 1.0.2
|
||||
+ dbus_server_unref@Base 1.0.2
|
||||
+ dbus_set_error@Base 1.0.2
|
||||
+ dbus_set_error_const@Base 1.0.2
|
||||
+ dbus_set_error_from_message@Base 1.0.2
|
||||
+ dbus_setenv@Base 1.7.6
|
||||
+ dbus_shutdown@Base 1.0.2
|
||||
+ dbus_signature_iter_get_current_type@Base 1.0.2
|
||||
+ dbus_signature_iter_get_element_type@Base 1.0.2
|
||||
+ dbus_signature_iter_get_signature@Base 1.0.2
|
||||
+ dbus_signature_iter_init@Base 1.0.2
|
||||
+ dbus_signature_iter_next@Base 1.0.2
|
||||
+ dbus_signature_iter_recurse@Base 1.0.2
|
||||
+ dbus_signature_validate@Base 1.0.2
|
||||
+ dbus_signature_validate_single@Base 1.0.2
|
||||
+ dbus_threads_init@Base 1.0.2
|
||||
+ dbus_threads_init_default@Base 1.0.2
|
||||
+ dbus_timeout_get_data@Base 1.0.2
|
||||
+ dbus_timeout_get_enabled@Base 1.0.2
|
||||
+ dbus_timeout_get_interval@Base 1.0.2
|
||||
+ dbus_timeout_handle@Base 1.0.2
|
||||
+ dbus_timeout_set_data@Base 1.0.2
|
||||
+ dbus_type_is_basic@Base 1.0.2
|
||||
+ dbus_type_is_container@Base 1.0.2
|
||||
+ dbus_type_is_fixed@Base 1.0.2
|
||||
+ dbus_type_is_valid@Base 1.5.0
|
||||
+ dbus_validate_bus_name@Base 1.5.12
|
||||
+ dbus_validate_error_name@Base 1.5.12
|
||||
+ dbus_validate_interface@Base 1.5.12
|
||||
+ dbus_validate_member@Base 1.5.12
|
||||
+ dbus_validate_path@Base 1.5.12
|
||||
+ dbus_validate_utf8@Base 1.5.12
|
||||
+ dbus_watch_get_data@Base 1.0.2
|
||||
+ dbus_watch_get_enabled@Base 1.0.2
|
||||
+ dbus_watch_get_fd@Base 1.0.2
|
||||
+ dbus_watch_get_flags@Base 1.0.2
|
||||
+ dbus_watch_get_socket@Base 1.1.1
|
||||
+ dbus_watch_get_unix_fd@Base 1.1.1
|
||||
+ dbus_watch_handle@Base 1.0.2
|
||||
+ dbus_watch_set_data@Base 1.0.2
|
||||
diff --git a/build/linux/sysroot_scripts/sysroot-creator.sh b/build/linux/sysroot_scripts/sysroot-creator.sh
|
||||
index 87720e50997b..c4b56ab8eef4 100644
|
||||
--- a/build/linux/sysroot_scripts/sysroot-creator.sh
|
||||
+++ b/build/linux/sysroot_scripts/sysroot-creator.sh
|
||||
@@ -291,6 +291,16 @@ HacksAndPatchesAmd64() {
|
||||
sed -i -e 's|/usr/lib/x86_64-linux-gnu/||g' ${lscripts}
|
||||
sed -i -e 's|/lib/x86_64-linux-gnu/||g' ${lscripts}
|
||||
|
||||
+ # Unversion libdbus symbols. This is required because libdbus-1-3
|
||||
+ # switched from unversioned symbols to versioned ones, and we must
|
||||
+ # still support distros using the unversioned library. This hack
|
||||
+ # can be removed once support for Ubuntu Trusty and Debian Jessie
|
||||
+ # are dropped.
|
||||
+ strip -R .gnu.version_d -R .gnu.version \
|
||||
+ "${INSTALL_ROOT}/lib/x86_64-linux-gnu/libdbus-1.so.3"
|
||||
+ cp "${SCRIPT_DIR}/libdbus-1-3-symbols" \
|
||||
+ "${INSTALL_ROOT}/debian/libdbus-1-3/DEBIAN/symbols"
|
||||
+
|
||||
# This is for chrome's ./build/linux/pkg-config-wrapper
|
||||
# which overwrites PKG_CONFIG_LIBDIR internally
|
||||
SubBanner "Move pkgconfig scripts"
|
||||
@@ -311,6 +321,16 @@ HacksAndPatchesI386() {
|
||||
sed -i -e 's|/usr/lib/i386-linux-gnu/||g' ${lscripts}
|
||||
sed -i -e 's|/lib/i386-linux-gnu/||g' ${lscripts}
|
||||
|
||||
+ # Unversion libdbus symbols. This is required because libdbus-1-3
|
||||
+ # switched from unversioned symbols to versioned ones, and we must
|
||||
+ # still support distros using the unversioned library. This hack
|
||||
+ # can be removed once support for Ubuntu Trusty and Debian Jessie
|
||||
+ # are dropped.
|
||||
+ strip -R .gnu.version_d -R .gnu.version \
|
||||
+ "${INSTALL_ROOT}/lib/i386-linux-gnu/libdbus-1.so.3"
|
||||
+ cp "${SCRIPT_DIR}/libdbus-1-3-symbols" \
|
||||
+ "${INSTALL_ROOT}/debian/libdbus-1-3/DEBIAN/symbols"
|
||||
+
|
||||
# This is for chrome's ./build/linux/pkg-config-wrapper
|
||||
# which overwrites PKG_CONFIG_LIBDIR internally
|
||||
SubBanner "Move pkgconfig scripts"
|
||||
@@ -331,6 +351,16 @@ HacksAndPatchesARM() {
|
||||
sed -i -e 's|/usr/lib/arm-linux-gnueabihf/||g' ${lscripts}
|
||||
sed -i -e 's|/lib/arm-linux-gnueabihf/||g' ${lscripts}
|
||||
|
||||
+ # Unversion libdbus symbols. This is required because libdbus-1-3
|
||||
+ # switched from unversioned symbols to versioned ones, and we must
|
||||
+ # still support distros using the unversioned library. This hack
|
||||
+ # can be removed once support for Ubuntu Trusty and Debian Jessie
|
||||
+ # are dropped.
|
||||
+ arm-linux-gnueabihf-strip -R .gnu.version_d -R .gnu.version \
|
||||
+ "${INSTALL_ROOT}/lib/arm-linux-gnueabihf/libdbus-1.so.3"
|
||||
+ cp "${SCRIPT_DIR}/libdbus-1-3-symbols" \
|
||||
+ "${INSTALL_ROOT}/debian/libdbus-1-3/DEBIAN/symbols"
|
||||
+
|
||||
# This is for chrome's ./build/linux/pkg-config-wrapper
|
||||
# which overwrites PKG_CONFIG_LIBDIR internally
|
||||
SubBanner "Move pkgconfig files"
|
||||
@@ -350,6 +380,16 @@ HacksAndPatchesARM64() {
|
||||
sed -i -e 's|/usr/lib/aarch64-linux-gnu/||g' ${lscripts}
|
||||
sed -i -e 's|/lib/aarch64-linux-gnu/||g' ${lscripts}
|
||||
|
||||
+ # Unversion libdbus symbols. This is required because libdbus-1-3
|
||||
+ # switched from unversioned symbols to versioned ones, and we must
|
||||
+ # still support distros using the unversioned library. This hack
|
||||
+ # can be removed once support for Ubuntu Trusty and Debian Jessie
|
||||
+ # are dropped.
|
||||
+ aarch64-linux-gnu-strip -R .gnu.version_d -R .gnu.version \
|
||||
+ "${INSTALL_ROOT}/lib/aarch64-linux-gnu/libdbus-1.so.3"
|
||||
+ cp "${SCRIPT_DIR}/libdbus-1-3-symbols" \
|
||||
+ "${INSTALL_ROOT}/debian/libdbus-1-3/DEBIAN/symbols"
|
||||
+
|
||||
# This is for chrome's ./build/linux/pkg-config-wrapper
|
||||
# which overwrites PKG_CONFIG_LIBDIR internally
|
||||
SubBanner "Move pkgconfig files"
|
||||
@@ -370,6 +410,16 @@ HacksAndPatchesMips() {
|
||||
sed -i -e 's|/usr/lib/mipsel-linux-gnu/||g' ${lscripts}
|
||||
sed -i -e 's|/lib/mipsel-linux-gnu/||g' ${lscripts}
|
||||
|
||||
+ # Unversion libdbus symbols. This is required because libdbus-1-3
|
||||
+ # switched from unversioned symbols to versioned ones, and we must
|
||||
+ # still support distros using the unversioned library. This hack
|
||||
+ # can be removed once support for Ubuntu Trusty and Debian Jessie
|
||||
+ # are dropped.
|
||||
+ mipsel-linux-gnu-strip -R .gnu.version_d -R .gnu.version \
|
||||
+ "${INSTALL_ROOT}/lib/mipsel-linux-gnu/libdbus-1.so.3"
|
||||
+ cp "${SCRIPT_DIR}/libdbus-1-3-symbols" \
|
||||
+ "${INSTALL_ROOT}/debian/libdbus-1-3/DEBIAN/symbols"
|
||||
+
|
||||
# This is for chrome's ./build/linux/pkg-config-wrapper
|
||||
# which overwrites PKG_CONFIG_LIBDIR internally
|
||||
SubBanner "Move pkgconfig files"
|
||||
@@ -390,6 +440,16 @@ HacksAndPatchesMips64el() {
|
||||
sed -i -e 's|/usr/lib/mips64el-linux-gnuabi64/||g' ${lscripts}
|
||||
sed -i -e 's|/lib/mips64el-linux-gnuabi64/||g' ${lscripts}
|
||||
|
||||
+ # Unversion libdbus symbols. This is required because libdbus-1-3
|
||||
+ # switched from unversioned symbols to versioned ones, and we must
|
||||
+ # still support distros using the unversioned library. This hack
|
||||
+ # can be removed once support for Ubuntu Trusty and Debian Jessie
|
||||
+ # are dropped.
|
||||
+ mips64el-linux-gnuabi64-strip -R .gnu.version_d -R .gnu.version \
|
||||
+ "${INSTALL_ROOT}/lib/mips64el-linux-gnuabi64/libdbus-1.so.3"
|
||||
+ cp "${SCRIPT_DIR}/libdbus-1-3-symbols" \
|
||||
+ "${INSTALL_ROOT}/debian/libdbus-1-3/DEBIAN/symbols"
|
||||
+
|
||||
# This is for chrome's ./build/linux/pkg-config-wrapper
|
||||
# which overwrites PKG_CONFIG_LIBDIR internally
|
||||
SubBanner "Move pkgconfig files"
|
||||
|
|
@ -1,64 +0,0 @@
|
|||
97f5f9df69889a313470a8530a8a724cf17cca90
|
||||
diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni
|
||||
index 4dec4e909bcb..f26a55f5d077 100644
|
||||
--- a/build/config/sysroot.gni
|
||||
+++ b/build/config/sysroot.gni
|
||||
@@ -40,7 +40,9 @@ if (current_os == target_os && current_cpu == target_cpu &&
|
||||
} else {
|
||||
assert(false, "No android sysroot for cpu: $target_cpu")
|
||||
}
|
||||
-} else if (is_chromeos && use_sysroot) {
|
||||
+} else if (is_linux && use_sysroot) {
|
||||
+ # By default build against a sysroot image downloaded from Cloud Storage
|
||||
+ # during gclient runhooks.
|
||||
if (current_cpu == "x64") {
|
||||
sysroot = "$target_sysroot_dir/debian_stretch_amd64-sysroot"
|
||||
} else if (current_cpu == "x86") {
|
||||
@@ -51,22 +53,6 @@ if (current_os == target_os && current_cpu == target_cpu &&
|
||||
sysroot = "$target_sysroot_dir/debian_stretch_arm-sysroot"
|
||||
} else if (current_cpu == "arm64") {
|
||||
sysroot = "$target_sysroot_dir/debian_stretch_arm64-sysroot"
|
||||
- } else {
|
||||
- assert(false, "No chromeos sysroot for cpu: $target_cpu")
|
||||
- }
|
||||
-} else if (is_linux && use_sysroot) {
|
||||
- # By default build against a sysroot image downloaded from Cloud Storage
|
||||
- # during gclient runhooks.
|
||||
- if (current_cpu == "x64") {
|
||||
- sysroot = "$target_sysroot_dir/debian_jessie_amd64-sysroot"
|
||||
- } else if (current_cpu == "x86") {
|
||||
- sysroot = "$target_sysroot_dir/debian_jessie_i386-sysroot"
|
||||
- } else if (current_cpu == "mipsel") {
|
||||
- sysroot = "$target_sysroot_dir/debian_jessie_mips-sysroot"
|
||||
- } else if (current_cpu == "arm") {
|
||||
- sysroot = "$target_sysroot_dir/debian_jessie_arm-sysroot"
|
||||
- } else if (current_cpu == "arm64") {
|
||||
- sysroot = "$target_sysroot_dir/debian_jessie_arm64-sysroot"
|
||||
} else {
|
||||
assert(false, "No linux sysroot for cpu: $target_cpu")
|
||||
}
|
||||
diff --git a/build/linux/sysroot_scripts/install-sysroot.py b/build/linux/sysroot_scripts/install-sysroot.py
|
||||
index e6c2c9b8ef65..fe01daa67451 100755
|
||||
--- a/build/linux/sysroot_scripts/install-sysroot.py
|
||||
+++ b/build/linux/sysroot_scripts/install-sysroot.py
|
||||
@@ -159,19 +159,13 @@ def main(args):
|
||||
print 'You much specify either --arch, --all or --running-as-hook'
|
||||
return 1
|
||||
|
||||
- # Desktop Chromium OS builds require the stretch sysroot.
|
||||
- # TODO(thomasanderson): only download this when the GN arg target_os
|
||||
- # == 'chromeos', when the functionality to perform the check becomes
|
||||
- # available.
|
||||
- InstallSysroot('Stretch', 'amd64')
|
||||
-
|
||||
return 0
|
||||
|
||||
|
||||
def InstallDefaultSysrootForArch(target_arch):
|
||||
if target_arch not in VALID_ARCHS:
|
||||
raise Error('Unknown architecture: %s' % target_arch)
|
||||
- InstallSysroot('Jessie', target_arch)
|
||||
+ InstallSysroot('Stretch', target_arch)
|
||||
|
||||
|
||||
def InstallSysroot(target_platform, target_arch):
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
99b48b47f11fabf55f338a049ec8d0473f00e6e7
|
||||
diff --git a/build/linux/sysroot_scripts/sysroots.json b/build/linux/sysroot_scripts/sysroots.json
|
||||
index 1c87b26c167e..bc51bf735862 100644
|
||||
--- a/build/linux/sysroot_scripts/sysroots.json
|
||||
+++ b/build/linux/sysroot_scripts/sysroots.json
|
||||
@@ -30,38 +30,38 @@
|
||||
"Tarball": "debian_jessie_mips_sysroot.tar.xz"
|
||||
},
|
||||
"stretch_amd64": {
|
||||
- "Revision": "1126d9b629c97385a503debac7a1b59e60a3ab1b",
|
||||
- "Sha1Sum": "a73bcd43fc4910afe264f730f7c06f5ef5c965cd",
|
||||
+ "Revision": "78c7b1906cf3ee5f342eddc46398c97530e8757a",
|
||||
+ "Sha1Sum": "ee33ea4e4de55a2d24c4d28aea83cfcf3eecad4e",
|
||||
"SysrootDir": "debian_stretch_amd64-sysroot",
|
||||
"Tarball": "debian_stretch_amd64_sysroot.tar.xz"
|
||||
},
|
||||
"stretch_arm": {
|
||||
- "Revision": "1126d9b629c97385a503debac7a1b59e60a3ab1b",
|
||||
- "Sha1Sum": "7c5c22fbfca6fd825a63363bc906fbfa800d7f95",
|
||||
+ "Revision": "78c7b1906cf3ee5f342eddc46398c97530e8757a",
|
||||
+ "Sha1Sum": "d322e43a2b714eae47dd5defdc96217c87a4b3de",
|
||||
"SysrootDir": "debian_stretch_arm-sysroot",
|
||||
"Tarball": "debian_stretch_arm_sysroot.tar.xz"
|
||||
},
|
||||
"stretch_arm64": {
|
||||
- "Revision": "1126d9b629c97385a503debac7a1b59e60a3ab1b",
|
||||
- "Sha1Sum": "ab8063f2d9d6b777797653041851c3f9274a33af",
|
||||
+ "Revision": "78c7b1906cf3ee5f342eddc46398c97530e8757a",
|
||||
+ "Sha1Sum": "9d045c8c2c302f88d99f84e9c82953beeb495164",
|
||||
"SysrootDir": "debian_stretch_arm64-sysroot",
|
||||
"Tarball": "debian_stretch_arm64_sysroot.tar.xz"
|
||||
},
|
||||
"stretch_i386": {
|
||||
- "Revision": "1126d9b629c97385a503debac7a1b59e60a3ab1b",
|
||||
- "Sha1Sum": "72ed2ce337bd40e8e7a89e5501b0b63050453d6c",
|
||||
+ "Revision": "78c7b1906cf3ee5f342eddc46398c97530e8757a",
|
||||
+ "Sha1Sum": "9c7a45ab99ce6bb24935108b2d92a129f935c459",
|
||||
"SysrootDir": "debian_stretch_i386-sysroot",
|
||||
"Tarball": "debian_stretch_i386_sysroot.tar.xz"
|
||||
},
|
||||
"stretch_mips": {
|
||||
- "Revision": "1126d9b629c97385a503debac7a1b59e60a3ab1b",
|
||||
- "Sha1Sum": "fe5949ed3795aa64913a27389052637ea2629da3",
|
||||
+ "Revision": "78c7b1906cf3ee5f342eddc46398c97530e8757a",
|
||||
+ "Sha1Sum": "191df324dba5f82ffffbb750fa2c887146db28a7",
|
||||
"SysrootDir": "debian_stretch_mips-sysroot",
|
||||
"Tarball": "debian_stretch_mips_sysroot.tar.xz"
|
||||
},
|
||||
"stretch_mips64el": {
|
||||
- "Revision": "1126d9b629c97385a503debac7a1b59e60a3ab1b",
|
||||
- "Sha1Sum": "5d95b45a9633c3c874d3ab9326306b0e951f01f1",
|
||||
+ "Revision": "78c7b1906cf3ee5f342eddc46398c97530e8757a",
|
||||
+ "Sha1Sum": "3941b9493d200423bb55bd5ab4ff2585fbf667c4",
|
||||
"SysrootDir": "debian_stretch_mips64el-sysroot",
|
||||
"Tarball": "debian_stretch_mips64el_sysroot.tar.xz"
|
||||
}
|
||||
|
|
@ -1,139 +0,0 @@
|
|||
a6977980088b9112787e4d69b116032379a164e4
|
||||
diff --git a/build/linux/sysroot_scripts/packagelist.stretch.amd64 b/build/linux/sysroot_scripts/packagelist.stretch.amd64
|
||||
index 6e01c0def726..537faa690096 100644
|
||||
--- a/build/linux/sysroot_scripts/packagelist.stretch.amd64
|
||||
+++ b/build/linux/sysroot_scripts/packagelist.stretch.amd64
|
||||
@@ -73,6 +73,7 @@ http://ftp.us.debian.org/debian/pool/main/k/krb5/libkdb5-8_1.15-1+deb9u1_amd64.d
|
||||
http://ftp.us.debian.org/debian/pool/main/k/krb5/libkrb5-3_1.15-1+deb9u1_amd64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/k/krb5/libkrb5-dev_1.15-1+deb9u1_amd64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/k/krb5/libkrb5support0_1.15-1+deb9u1_amd64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/libb/libbsd/libbsd0_0.8.3-1_amd64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libc/libcap2/libcap2_2.25-1_amd64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libc/libcap2/libcap-dev_2.25-1_amd64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libd/libdrm/libdrm2_2.4.74-1_amd64.deb
|
||||
diff --git a/build/linux/sysroot_scripts/packagelist.stretch.arm b/build/linux/sysroot_scripts/packagelist.stretch.arm
|
||||
index d58ff93ef92a..3de9a8efa4d0 100644
|
||||
--- a/build/linux/sysroot_scripts/packagelist.stretch.arm
|
||||
+++ b/build/linux/sysroot_scripts/packagelist.stretch.arm
|
||||
@@ -67,6 +67,7 @@ http://ftp.us.debian.org/debian/pool/main/k/krb5/libkdb5-8_1.15-1+deb9u1_armhf.d
|
||||
http://ftp.us.debian.org/debian/pool/main/k/krb5/libkrb5-3_1.15-1+deb9u1_armhf.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/k/krb5/libkrb5-dev_1.15-1+deb9u1_armhf.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/k/krb5/libkrb5support0_1.15-1+deb9u1_armhf.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/libb/libbsd/libbsd0_0.8.3-1_armhf.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libc/libcap2/libcap2_2.25-1_armhf.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libc/libcap2/libcap-dev_2.25-1_armhf.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libd/libdrm/libdrm2_2.4.74-1_armhf.deb
|
||||
diff --git a/build/linux/sysroot_scripts/packagelist.stretch.arm64 b/build/linux/sysroot_scripts/packagelist.stretch.arm64
|
||||
index 830ac4751209..25437eaa8e21 100644
|
||||
--- a/build/linux/sysroot_scripts/packagelist.stretch.arm64
|
||||
+++ b/build/linux/sysroot_scripts/packagelist.stretch.arm64
|
||||
@@ -69,6 +69,7 @@ http://ftp.us.debian.org/debian/pool/main/k/krb5/libkdb5-8_1.15-1+deb9u1_arm64.d
|
||||
http://ftp.us.debian.org/debian/pool/main/k/krb5/libkrb5-3_1.15-1+deb9u1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/k/krb5/libkrb5-dev_1.15-1+deb9u1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/k/krb5/libkrb5support0_1.15-1+deb9u1_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/libb/libbsd/libbsd0_0.8.3-1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libc/libcap2/libcap2_2.25-1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libc/libcap2/libcap-dev_2.25-1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libd/libdatrie/libdatrie1_0.2.10-4+b1_arm64.deb
|
||||
diff --git a/build/linux/sysroot_scripts/packagelist.stretch.i386 b/build/linux/sysroot_scripts/packagelist.stretch.i386
|
||||
index 8c305746d3bf..28a2423d23fd 100644
|
||||
--- a/build/linux/sysroot_scripts/packagelist.stretch.i386
|
||||
+++ b/build/linux/sysroot_scripts/packagelist.stretch.i386
|
||||
@@ -71,6 +71,7 @@ http://ftp.us.debian.org/debian/pool/main/k/krb5/libkdb5-8_1.15-1+deb9u1_i386.de
|
||||
http://ftp.us.debian.org/debian/pool/main/k/krb5/libkrb5-3_1.15-1+deb9u1_i386.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/k/krb5/libkrb5-dev_1.15-1+deb9u1_i386.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/k/krb5/libkrb5support0_1.15-1+deb9u1_i386.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/libb/libbsd/libbsd0_0.8.3-1_i386.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libc/libcap2/libcap2_2.25-1_i386.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libc/libcap2/libcap-dev_2.25-1_i386.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libd/libdrm/libdrm2_2.4.74-1_i386.deb
|
||||
diff --git a/build/linux/sysroot_scripts/packagelist.stretch.mips64el b/build/linux/sysroot_scripts/packagelist.stretch.mips64el
|
||||
index 199b6418aba8..7390896af5c9 100644
|
||||
--- a/build/linux/sysroot_scripts/packagelist.stretch.mips64el
|
||||
+++ b/build/linux/sysroot_scripts/packagelist.stretch.mips64el
|
||||
@@ -65,6 +65,7 @@ http://ftp.us.debian.org/debian/pool/main/k/krb5/libkdb5-8_1.15-1+deb9u1_mips64e
|
||||
http://ftp.us.debian.org/debian/pool/main/k/krb5/libkrb5-3_1.15-1+deb9u1_mips64el.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/k/krb5/libkrb5-dev_1.15-1+deb9u1_mips64el.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/k/krb5/libkrb5support0_1.15-1+deb9u1_mips64el.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/libb/libbsd/libbsd0_0.8.3-1_mips64el.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libc/libcap2/libcap2_2.25-1_mips64el.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libc/libcap2/libcap-dev_2.25-1_mips64el.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libd/libdrm/libdrm2_2.4.74-1_mips64el.deb
|
||||
diff --git a/build/linux/sysroot_scripts/packagelist.stretch.mipsel b/build/linux/sysroot_scripts/packagelist.stretch.mipsel
|
||||
index 54ef06294504..8fd9d5b4eb10 100644
|
||||
--- a/build/linux/sysroot_scripts/packagelist.stretch.mipsel
|
||||
+++ b/build/linux/sysroot_scripts/packagelist.stretch.mipsel
|
||||
@@ -65,6 +65,7 @@ http://ftp.us.debian.org/debian/pool/main/k/krb5/libkdb5-8_1.15-1+deb9u1_mipsel.
|
||||
http://ftp.us.debian.org/debian/pool/main/k/krb5/libkrb5-3_1.15-1+deb9u1_mipsel.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/k/krb5/libkrb5-dev_1.15-1+deb9u1_mipsel.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/k/krb5/libkrb5support0_1.15-1+deb9u1_mipsel.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/libb/libbsd/libbsd0_0.8.3-1_mipsel.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libc/libcap2/libcap2_2.25-1_mipsel.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libc/libcap2/libcap-dev_2.25-1_mipsel.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libd/libdrm/libdrm2_2.4.74-1_mipsel.deb
|
||||
diff --git a/build/linux/sysroot_scripts/sysroot-creator-stretch.sh b/build/linux/sysroot_scripts/sysroot-creator-stretch.sh
|
||||
index 40cf046d2609..d39745ac11b7 100755
|
||||
--- a/build/linux/sysroot_scripts/sysroot-creator-stretch.sh
|
||||
+++ b/build/linux/sysroot_scripts/sysroot-creator-stretch.sh
|
||||
@@ -47,6 +47,7 @@ DEBIAN_PACKAGES="\
|
||||
libbluetooth-dev
|
||||
libbrlapi0.6
|
||||
libbrlapi-dev
|
||||
+ libbsd0
|
||||
libc6
|
||||
libc6-dev
|
||||
libcairo2
|
||||
diff --git a/build/linux/sysroot_scripts/sysroots.json b/build/linux/sysroot_scripts/sysroots.json
|
||||
index 62e63e58747d..2e818f3033af 100644
|
||||
--- a/build/linux/sysroot_scripts/sysroots.json
|
||||
+++ b/build/linux/sysroot_scripts/sysroots.json
|
||||
@@ -1,37 +1,37 @@
|
||||
{
|
||||
"stretch_amd64": {
|
||||
- "Revision": "78c7b1906cf3ee5f342eddc46398c97530e8757a",
|
||||
- "Sha1Sum": "ee33ea4e4de55a2d24c4d28aea83cfcf3eecad4e",
|
||||
+ "Revision": "2202c161310ffde63729f29d27fe7bb24a0bc540",
|
||||
+ "Sha1Sum": "eb7e2d2c563b6a6f6e32b967d5585a6d33636d35",
|
||||
"SysrootDir": "debian_stretch_amd64-sysroot",
|
||||
"Tarball": "debian_stretch_amd64_sysroot.tar.xz"
|
||||
},
|
||||
"stretch_arm": {
|
||||
- "Revision": "78c7b1906cf3ee5f342eddc46398c97530e8757a",
|
||||
- "Sha1Sum": "d322e43a2b714eae47dd5defdc96217c87a4b3de",
|
||||
+ "Revision": "2202c161310ffde63729f29d27fe7bb24a0bc540",
|
||||
+ "Sha1Sum": "1d827c64de8f0205bef7ec0c9c7f769326e32141",
|
||||
"SysrootDir": "debian_stretch_arm-sysroot",
|
||||
"Tarball": "debian_stretch_arm_sysroot.tar.xz"
|
||||
},
|
||||
"stretch_arm64": {
|
||||
- "Revision": "78c7b1906cf3ee5f342eddc46398c97530e8757a",
|
||||
- "Sha1Sum": "9d045c8c2c302f88d99f84e9c82953beeb495164",
|
||||
+ "Revision": "2202c161310ffde63729f29d27fe7bb24a0bc540",
|
||||
+ "Sha1Sum": "2649a7ffa2e0d9a42a9a567a33967ec706bd3b8e",
|
||||
"SysrootDir": "debian_stretch_arm64-sysroot",
|
||||
"Tarball": "debian_stretch_arm64_sysroot.tar.xz"
|
||||
},
|
||||
"stretch_i386": {
|
||||
- "Revision": "78c7b1906cf3ee5f342eddc46398c97530e8757a",
|
||||
- "Sha1Sum": "9c7a45ab99ce6bb24935108b2d92a129f935c459",
|
||||
+ "Revision": "2202c161310ffde63729f29d27fe7bb24a0bc540",
|
||||
+ "Sha1Sum": "8fa3ac112fe5bb583624100379f715f3db5d6965",
|
||||
"SysrootDir": "debian_stretch_i386-sysroot",
|
||||
"Tarball": "debian_stretch_i386_sysroot.tar.xz"
|
||||
},
|
||||
"stretch_mips": {
|
||||
- "Revision": "78c7b1906cf3ee5f342eddc46398c97530e8757a",
|
||||
- "Sha1Sum": "191df324dba5f82ffffbb750fa2c887146db28a7",
|
||||
+ "Revision": "2202c161310ffde63729f29d27fe7bb24a0bc540",
|
||||
+ "Sha1Sum": "85a3f9e3f2d6ff2a5b2623f202689ef03ea12231",
|
||||
"SysrootDir": "debian_stretch_mips-sysroot",
|
||||
"Tarball": "debian_stretch_mips_sysroot.tar.xz"
|
||||
},
|
||||
"stretch_mips64el": {
|
||||
- "Revision": "78c7b1906cf3ee5f342eddc46398c97530e8757a",
|
||||
- "Sha1Sum": "3941b9493d200423bb55bd5ab4ff2585fbf667c4",
|
||||
+ "Revision": "2202c161310ffde63729f29d27fe7bb24a0bc540",
|
||||
+ "Sha1Sum": "004ad054e0613b9d8d51573068387625bb657d12",
|
||||
"SysrootDir": "debian_stretch_mips64el-sysroot",
|
||||
"Tarball": "debian_stretch_mips64el_sysroot.tar.xz"
|
||||
}
|
||||
|
|
@ -1,505 +0,0 @@
|
|||
From c1690d39c1e6875377f4685b53a5423cb69e2947 Mon Sep 17 00:00:00 2001
|
||||
From: Bruce Dawson <brucedawson@chromium.org>
|
||||
Date: Mon, 16 Oct 2017 20:02:46 +0000
|
||||
Subject: [PATCH] Updates to build with Fall Creators Update SDK
|
||||
|
||||
Some Microsoft::WRL classes in the Fall Creators Update SDK reference an
|
||||
undefined function called FillArrayWithIidHelper. This is normally never
|
||||
instantiated but __declspec(dllexport) of a class that derives from one
|
||||
of these classes leads to compile errors, as reported here:
|
||||
|
||||
https://developercommunity.visualstudio.com/content/problem/128961/idwritetextanalysissource-error-in-vs-2017-update.html
|
||||
|
||||
The response so far from Microsoft has been "don't do that" which is not
|
||||
totally unreasonable, especially given the compile cost of generating
|
||||
and exporting all those unneeded functions. It appears that a small
|
||||
number of factory functions can avoid the need to export these classes,
|
||||
so that's what this change does.
|
||||
|
||||
Bug: 773476
|
||||
Change-Id: I7f201e56e64f880fc71d369a48ffdf6e07e2c5e3
|
||||
Reviewed-on: https://chromium-review.googlesource.com/717480
|
||||
Reviewed-by: Avi Drissman <avi@chromium.org>
|
||||
Reviewed-by: Robert Liao <robliao@chromium.org>
|
||||
Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/master@{#509146}
|
||||
---
|
||||
|
||||
diff --git a/content/browser/renderer_host/dwrite_font_proxy_message_filter_win.cc b/content/browser/renderer_host/dwrite_font_proxy_message_filter_win.cc
|
||||
index ce525f84..cbe75f9 100644
|
||||
--- a/content/browser/renderer_host/dwrite_font_proxy_message_filter_win.cc
|
||||
+++ b/content/browser/renderer_host/dwrite_font_proxy_message_filter_win.cc
|
||||
@@ -395,7 +395,7 @@
|
||||
return;
|
||||
}
|
||||
mswr::ComPtr<IDWriteTextAnalysisSource> analysis_source;
|
||||
- if (FAILED(mswr::MakeAndInitialize<gfx::win::TextAnalysisSource>(
|
||||
+ if (FAILED(gfx::win::TextAnalysisSource::Create(
|
||||
&analysis_source, text, locale_name, number_substitution.Get(),
|
||||
static_cast<DWRITE_READING_DIRECTION>(reading_direction)))) {
|
||||
DCHECK(false);
|
||||
diff --git a/content/child/dwrite_font_proxy/dwrite_font_proxy_init_impl_win.cc b/content/child/dwrite_font_proxy/dwrite_font_proxy_init_impl_win.cc
|
||||
index 741bd36..123353a 100644
|
||||
--- a/content/child/dwrite_font_proxy/dwrite_font_proxy_init_impl_win.cc
|
||||
+++ b/content/child/dwrite_font_proxy/dwrite_font_proxy_init_impl_win.cc
|
||||
@@ -66,15 +66,14 @@
|
||||
sender = ChildThreadImpl::current()->thread_safe_sender();
|
||||
|
||||
if (!g_font_collection) {
|
||||
- mswr::MakeAndInitialize<DWriteFontCollectionProxy>(&g_font_collection,
|
||||
- factory.Get(), sender);
|
||||
+ DWriteFontCollectionProxy::Create(&g_font_collection, factory.Get(),
|
||||
+ sender);
|
||||
}
|
||||
|
||||
mswr::ComPtr<IDWriteFactory2> factory2;
|
||||
|
||||
if (SUCCEEDED(factory.As(&factory2)) && factory2.Get()) {
|
||||
- mswr::MakeAndInitialize<FontFallback>(&g_font_fallback,
|
||||
- g_font_collection.Get(), sender);
|
||||
+ FontFallback::Create(&g_font_fallback, g_font_collection.Get(), sender);
|
||||
}
|
||||
|
||||
sk_sp<SkFontMgr> skia_font_manager = SkFontMgr_New_DirectWrite(
|
||||
diff --git a/content/child/dwrite_font_proxy/dwrite_font_proxy_win.cc b/content/child/dwrite_font_proxy/dwrite_font_proxy_win.cc
|
||||
index 15dded6..f23b7e2 100644
|
||||
--- a/content/child/dwrite_font_proxy/dwrite_font_proxy_win.cc
|
||||
+++ b/content/child/dwrite_font_proxy/dwrite_font_proxy_win.cc
|
||||
@@ -75,6 +75,13 @@
|
||||
|
||||
} // namespace
|
||||
|
||||
+HRESULT DWriteFontCollectionProxy::Create(DWriteFontCollectionProxy** proxy_out,
|
||||
+ IDWriteFactory* dwrite_factory,
|
||||
+ IPC::Sender* sender) {
|
||||
+ return Microsoft::WRL::MakeAndInitialize<DWriteFontCollectionProxy>(
|
||||
+ proxy_out, dwrite_factory, sender);
|
||||
+}
|
||||
+
|
||||
DWriteFontCollectionProxy::DWriteFontCollectionProxy() = default;
|
||||
|
||||
DWriteFontCollectionProxy::~DWriteFontCollectionProxy() = default;
|
||||
diff --git a/content/child/dwrite_font_proxy/dwrite_font_proxy_win.h b/content/child/dwrite_font_proxy/dwrite_font_proxy_win.h
|
||||
index 2346e5e..3d01477 100644
|
||||
--- a/content/child/dwrite_font_proxy/dwrite_font_proxy_win.h
|
||||
+++ b/content/child/dwrite_font_proxy/dwrite_font_proxy_win.h
|
||||
@@ -30,13 +30,21 @@
|
||||
// into a custom font collection.
|
||||
// This is needed because the sandbox interferes with DirectWrite's
|
||||
// communication with the system font service.
|
||||
-class CONTENT_EXPORT DWriteFontCollectionProxy
|
||||
+class DWriteFontCollectionProxy
|
||||
: public Microsoft::WRL::RuntimeClass<
|
||||
Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
|
||||
IDWriteFontCollection,
|
||||
IDWriteFontCollectionLoader,
|
||||
IDWriteFontFileLoader> {
|
||||
public:
|
||||
+ // Factory method to avoid exporting the class and all it derives from.
|
||||
+ static CONTENT_EXPORT HRESULT Create(DWriteFontCollectionProxy** proxy_out,
|
||||
+ IDWriteFactory* dwrite_factory,
|
||||
+ IPC::Sender* sender);
|
||||
+
|
||||
+ // Use Create() to construct these objects. Direct calls to the constructor
|
||||
+ // are an error - it is only public because a WRL helper function creates the
|
||||
+ // objects.
|
||||
DWriteFontCollectionProxy();
|
||||
~DWriteFontCollectionProxy() override;
|
||||
|
||||
@@ -63,10 +71,10 @@
|
||||
UINT32 font_file_reference_key_size,
|
||||
IDWriteFontFileStream** font_file_stream) override;
|
||||
|
||||
- HRESULT STDMETHODCALLTYPE
|
||||
+ CONTENT_EXPORT HRESULT STDMETHODCALLTYPE
|
||||
RuntimeClassInitialize(IDWriteFactory* factory, IPC::Sender* sender_override);
|
||||
|
||||
- void Unregister();
|
||||
+ CONTENT_EXPORT void Unregister();
|
||||
|
||||
bool LoadFamily(UINT32 family_index,
|
||||
IDWriteFontCollection** containing_collection);
|
||||
@@ -99,7 +107,7 @@
|
||||
// stub, until something calls a method that requires actual font data. At that
|
||||
// point this will load the font files into a custom collection and
|
||||
// subsequently calls will be proxied to the resulting DirectWrite object.
|
||||
-class CONTENT_EXPORT DWriteFontFamilyProxy
|
||||
+class DWriteFontFamilyProxy
|
||||
: public Microsoft::WRL::RuntimeClass<
|
||||
Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
|
||||
IDWriteFontFamily> {
|
||||
@@ -151,7 +159,7 @@
|
||||
|
||||
// Implements the DirectWrite font file enumerator interface, backed by a list
|
||||
// of font files.
|
||||
-class CONTENT_EXPORT FontFileEnumerator
|
||||
+class FontFileEnumerator
|
||||
: public Microsoft::WRL::RuntimeClass<
|
||||
Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
|
||||
IDWriteFontFileEnumerator> {
|
||||
@@ -181,7 +189,7 @@
|
||||
// Implements the DirectWrite font file stream interface that maps the file to
|
||||
// be loaded as a memory mapped file, and subsequently returns pointers into
|
||||
// the mapped memory block.
|
||||
-class CONTENT_EXPORT FontFileStream
|
||||
+class FontFileStream
|
||||
: public Microsoft::WRL::RuntimeClass<
|
||||
Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
|
||||
IDWriteFontFileStream> {
|
||||
diff --git a/content/child/dwrite_font_proxy/dwrite_font_proxy_win_unittest.cc b/content/child/dwrite_font_proxy/dwrite_font_proxy_win_unittest.cc
|
||||
index 2fb66ba..002b683 100644
|
||||
--- a/content/child/dwrite_font_proxy/dwrite_font_proxy_win_unittest.cc
|
||||
+++ b/content/child/dwrite_font_proxy/dwrite_font_proxy_win_unittest.cc
|
||||
@@ -29,8 +29,9 @@
|
||||
DWriteFontProxyUnitTest() {
|
||||
fake_collection_ = new FakeFontCollection();
|
||||
SetupFonts(fake_collection_.get());
|
||||
- mswr::MakeAndInitialize<DWriteFontCollectionProxy>(
|
||||
- &collection_, factory.Get(), fake_collection_->GetTrackingSender());
|
||||
+ DWriteFontCollectionProxy::Create(&collection_, factory.Get(),
|
||||
+ fake_collection_->GetTrackingSender());
|
||||
+ EXPECT_TRUE(collection_.Get());
|
||||
}
|
||||
|
||||
~DWriteFontProxyUnitTest() override {
|
||||
@@ -343,8 +344,8 @@
|
||||
arial.AddFileHandle(IPC::TakePlatformFileForTransit(std::move(file)));
|
||||
}
|
||||
mswr::ComPtr<DWriteFontCollectionProxy> collection;
|
||||
- mswr::MakeAndInitialize<DWriteFontCollectionProxy>(
|
||||
- &collection, factory.Get(), fonts->GetTrackingSender());
|
||||
+ DWriteFontCollectionProxy::Create(&collection, factory.Get(),
|
||||
+ fonts->GetTrackingSender());
|
||||
|
||||
// Check that we can get the font family and match a font.
|
||||
UINT32 index = UINT_MAX;
|
||||
diff --git a/content/child/dwrite_font_proxy/font_fallback_win.cc b/content/child/dwrite_font_proxy/font_fallback_win.cc
|
||||
index 4bf78d2..d864240 100644
|
||||
--- a/content/child/dwrite_font_proxy/font_fallback_win.cc
|
||||
+++ b/content/child/dwrite_font_proxy/font_fallback_win.cc
|
||||
@@ -43,6 +43,13 @@
|
||||
|
||||
} // namespace
|
||||
|
||||
+HRESULT FontFallback::Create(FontFallback** font_fallback_out,
|
||||
+ DWriteFontCollectionProxy* collection,
|
||||
+ IPC::Sender* sender) {
|
||||
+ return Microsoft::WRL::MakeAndInitialize<FontFallback>(font_fallback_out,
|
||||
+ collection, sender);
|
||||
+}
|
||||
+
|
||||
FontFallback::FontFallback() = default;
|
||||
FontFallback::~FontFallback() = default;
|
||||
|
||||
diff --git a/content/child/dwrite_font_proxy/font_fallback_win.h b/content/child/dwrite_font_proxy/font_fallback_win.h
|
||||
index 195941d..3277482 100644
|
||||
--- a/content/child/dwrite_font_proxy/font_fallback_win.h
|
||||
+++ b/content/child/dwrite_font_proxy/font_fallback_win.h
|
||||
@@ -20,11 +20,19 @@
|
||||
|
||||
// Implements an IDWriteFontFallback that uses IPC to proxy the fallback calls
|
||||
// to the system fallback in the browser process.
|
||||
-class CONTENT_EXPORT FontFallback
|
||||
+class FontFallback
|
||||
: public Microsoft::WRL::RuntimeClass<
|
||||
Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
|
||||
IDWriteFontFallback> {
|
||||
public:
|
||||
+ // Factory method to avoid exporting the class and all it derives from.
|
||||
+ static CONTENT_EXPORT HRESULT Create(FontFallback** font_fallback_out,
|
||||
+ DWriteFontCollectionProxy* collection,
|
||||
+ IPC::Sender* sender);
|
||||
+
|
||||
+ // Use Create() to construct these objects. Direct calls to the constructor
|
||||
+ // are an error - it is only public because a WRL helper function creates the
|
||||
+ // objects.
|
||||
FontFallback();
|
||||
|
||||
HRESULT STDMETHODCALLTYPE
|
||||
diff --git a/content/child/dwrite_font_proxy/font_fallback_win_unittest.cc b/content/child/dwrite_font_proxy/font_fallback_win_unittest.cc
|
||||
index 7bc539b..64b54ff 100644
|
||||
--- a/content/child/dwrite_font_proxy/font_fallback_win_unittest.cc
|
||||
+++ b/content/child/dwrite_font_proxy/font_fallback_win_unittest.cc
|
||||
@@ -44,8 +44,8 @@
|
||||
.AddFamilyName(L"en-us", L"Segoe UI Symbol")
|
||||
.AddFilePath(segoe_path);
|
||||
|
||||
- mswr::MakeAndInitialize<DWriteFontCollectionProxy>(
|
||||
- &collection_, factory_.Get(), fake_collection_->GetSender());
|
||||
+ DWriteFontCollectionProxy::Create(&collection_, factory_.Get(),
|
||||
+ fake_collection_->GetSender());
|
||||
}
|
||||
|
||||
scoped_refptr<FakeFontCollection> fake_collection_;
|
||||
@@ -56,17 +56,17 @@
|
||||
|
||||
TEST_F(FontFallbackUnitTest, MapCharacters) {
|
||||
mswr::ComPtr<FontFallback> fallback;
|
||||
- mswr::MakeAndInitialize<FontFallback>(&fallback, collection_.Get(),
|
||||
- fake_collection_->GetSender());
|
||||
+ FontFallback::Create(&fallback, collection_.Get(),
|
||||
+ fake_collection_->GetSender());
|
||||
|
||||
mswr::ComPtr<IDWriteFont> font;
|
||||
UINT32 mapped_length = 0;
|
||||
float scale = 0.0;
|
||||
|
||||
- mswr::ComPtr<gfx::win::TextAnalysisSource> text;
|
||||
- mswr::MakeAndInitialize<gfx::win::TextAnalysisSource>(
|
||||
- &text, L"hello", L"en-us", number_substitution_.Get(),
|
||||
- DWRITE_READING_DIRECTION_LEFT_TO_RIGHT);
|
||||
+ mswr::ComPtr<IDWriteTextAnalysisSource> text;
|
||||
+ gfx::win::TextAnalysisSource::Create(&text, L"hello", L"en-us",
|
||||
+ number_substitution_.Get(),
|
||||
+ DWRITE_READING_DIRECTION_LEFT_TO_RIGHT);
|
||||
fallback->MapCharacters(text.Get(), 0, 5, nullptr, nullptr,
|
||||
DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL,
|
||||
DWRITE_FONT_STRETCH_NORMAL, &mapped_length, &font,
|
||||
@@ -78,17 +78,17 @@
|
||||
|
||||
TEST_F(FontFallbackUnitTest, DuplicateCallsShouldNotRepeatIPC) {
|
||||
mswr::ComPtr<FontFallback> fallback;
|
||||
- mswr::MakeAndInitialize<FontFallback>(&fallback, collection_.Get(),
|
||||
- fake_collection_->GetTrackingSender());
|
||||
+ FontFallback::Create(&fallback, collection_.Get(),
|
||||
+ fake_collection_->GetTrackingSender());
|
||||
|
||||
mswr::ComPtr<IDWriteFont> font;
|
||||
UINT32 mapped_length = 0;
|
||||
float scale = 0.0;
|
||||
|
||||
- mswr::ComPtr<gfx::win::TextAnalysisSource> text;
|
||||
- mswr::MakeAndInitialize<gfx::win::TextAnalysisSource>(
|
||||
- &text, L"hello", L"en-us", number_substitution_.Get(),
|
||||
- DWRITE_READING_DIRECTION_LEFT_TO_RIGHT);
|
||||
+ mswr::ComPtr<IDWriteTextAnalysisSource> text;
|
||||
+ gfx::win::TextAnalysisSource::Create(&text, L"hello", L"en-us",
|
||||
+ number_substitution_.Get(),
|
||||
+ DWRITE_READING_DIRECTION_LEFT_TO_RIGHT);
|
||||
fallback->MapCharacters(text.Get(), 0, 5, nullptr, nullptr,
|
||||
DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL,
|
||||
DWRITE_FONT_STRETCH_NORMAL, &mapped_length, &font,
|
||||
@@ -105,17 +105,17 @@
|
||||
|
||||
TEST_F(FontFallbackUnitTest, DifferentFamilyShouldNotReuseCache) {
|
||||
mswr::ComPtr<FontFallback> fallback;
|
||||
- mswr::MakeAndInitialize<FontFallback>(&fallback, collection_.Get(),
|
||||
- fake_collection_->GetTrackingSender());
|
||||
+ FontFallback::Create(&fallback, collection_.Get(),
|
||||
+ fake_collection_->GetTrackingSender());
|
||||
|
||||
mswr::ComPtr<IDWriteFont> font;
|
||||
UINT32 mapped_length = 0;
|
||||
float scale = 0.0;
|
||||
|
||||
- mswr::ComPtr<gfx::win::TextAnalysisSource> text;
|
||||
- mswr::MakeAndInitialize<gfx::win::TextAnalysisSource>(
|
||||
- &text, L"hello", L"en-us", number_substitution_.Get(),
|
||||
- DWRITE_READING_DIRECTION_LEFT_TO_RIGHT);
|
||||
+ mswr::ComPtr<IDWriteTextAnalysisSource> text;
|
||||
+ gfx::win::TextAnalysisSource::Create(&text, L"hello", L"en-us",
|
||||
+ number_substitution_.Get(),
|
||||
+ DWRITE_READING_DIRECTION_LEFT_TO_RIGHT);
|
||||
fallback->MapCharacters(text.Get(), 0, 5, nullptr, L"font1",
|
||||
DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL,
|
||||
DWRITE_FONT_STRETCH_NORMAL, &mapped_length, &font,
|
||||
@@ -130,21 +130,21 @@
|
||||
|
||||
TEST_F(FontFallbackUnitTest, CacheMissShouldRepeatIPC) {
|
||||
mswr::ComPtr<FontFallback> fallback;
|
||||
- mswr::MakeAndInitialize<FontFallback>(&fallback, collection_.Get(),
|
||||
- fake_collection_->GetTrackingSender());
|
||||
+ FontFallback::Create(&fallback, collection_.Get(),
|
||||
+ fake_collection_->GetTrackingSender());
|
||||
|
||||
mswr::ComPtr<IDWriteFont> font;
|
||||
UINT32 mapped_length = 0;
|
||||
float scale = 0.0;
|
||||
|
||||
- mswr::ComPtr<gfx::win::TextAnalysisSource> text;
|
||||
- mswr::MakeAndInitialize<gfx::win::TextAnalysisSource>(
|
||||
- &text, L"hello", L"en-us", number_substitution_.Get(),
|
||||
- DWRITE_READING_DIRECTION_LEFT_TO_RIGHT);
|
||||
- mswr::ComPtr<gfx::win::TextAnalysisSource> unmappable_text;
|
||||
- mswr::MakeAndInitialize<gfx::win::TextAnalysisSource>(
|
||||
- &unmappable_text, L"\uffff", L"en-us", number_substitution_.Get(),
|
||||
- DWRITE_READING_DIRECTION_LEFT_TO_RIGHT);
|
||||
+ mswr::ComPtr<IDWriteTextAnalysisSource> text;
|
||||
+ gfx::win::TextAnalysisSource::Create(&text, L"hello", L"en-us",
|
||||
+ number_substitution_.Get(),
|
||||
+ DWRITE_READING_DIRECTION_LEFT_TO_RIGHT);
|
||||
+ mswr::ComPtr<IDWriteTextAnalysisSource> unmappable_text;
|
||||
+ gfx::win::TextAnalysisSource::Create(&unmappable_text, L"\uffff", L"en-us",
|
||||
+ number_substitution_.Get(),
|
||||
+ DWRITE_READING_DIRECTION_LEFT_TO_RIGHT);
|
||||
fallback->MapCharacters(text.Get(), 0, 5, nullptr, nullptr,
|
||||
DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL,
|
||||
DWRITE_FONT_STRETCH_NORMAL, &mapped_length, &font,
|
||||
@@ -159,21 +159,21 @@
|
||||
|
||||
TEST_F(FontFallbackUnitTest, SurrogatePairCacheHit) {
|
||||
mswr::ComPtr<FontFallback> fallback;
|
||||
- mswr::MakeAndInitialize<FontFallback>(&fallback, collection_.Get(),
|
||||
- fake_collection_->GetTrackingSender());
|
||||
+ FontFallback::Create(&fallback, collection_.Get(),
|
||||
+ fake_collection_->GetTrackingSender());
|
||||
|
||||
mswr::ComPtr<IDWriteFont> font;
|
||||
UINT32 mapped_length = 0;
|
||||
float scale = 0.0;
|
||||
|
||||
- mswr::ComPtr<gfx::win::TextAnalysisSource> text;
|
||||
- mswr::MakeAndInitialize<gfx::win::TextAnalysisSource>(
|
||||
- &text, L"hello", L"en-us", number_substitution_.Get(),
|
||||
- DWRITE_READING_DIRECTION_LEFT_TO_RIGHT);
|
||||
- mswr::ComPtr<gfx::win::TextAnalysisSource> surrogate_pair_text;
|
||||
- mswr::MakeAndInitialize<gfx::win::TextAnalysisSource>(
|
||||
- &surrogate_pair_text, L"\U0001d300", L"en-us", number_substitution_.Get(),
|
||||
- DWRITE_READING_DIRECTION_LEFT_TO_RIGHT);
|
||||
+ mswr::ComPtr<IDWriteTextAnalysisSource> text;
|
||||
+ gfx::win::TextAnalysisSource::Create(&text, L"hello", L"en-us",
|
||||
+ number_substitution_.Get(),
|
||||
+ DWRITE_READING_DIRECTION_LEFT_TO_RIGHT);
|
||||
+ mswr::ComPtr<IDWriteTextAnalysisSource> surrogate_pair_text;
|
||||
+ gfx::win::TextAnalysisSource::Create(&surrogate_pair_text, L"\U0001d300",
|
||||
+ L"en-us", number_substitution_.Get(),
|
||||
+ DWRITE_READING_DIRECTION_LEFT_TO_RIGHT);
|
||||
fallback->MapCharacters(text.Get(), 0, 5, nullptr, nullptr,
|
||||
DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL,
|
||||
DWRITE_FONT_STRETCH_NORMAL, &mapped_length, &font,
|
||||
diff --git a/ui/base/dragdrop/drag_source_win.cc b/ui/base/dragdrop/drag_source_win.cc
|
||||
index 292ba3e..a797a721 100644
|
||||
--- a/ui/base/dragdrop/drag_source_win.cc
|
||||
+++ b/ui/base/dragdrop/drag_source_win.cc
|
||||
@@ -8,6 +8,10 @@
|
||||
|
||||
namespace ui {
|
||||
|
||||
+Microsoft::WRL::ComPtr<ui::DragSourceWin> DragSourceWin::Create() {
|
||||
+ return Microsoft::WRL::Make<ui::DragSourceWin>();
|
||||
+}
|
||||
+
|
||||
DragSourceWin::DragSourceWin() : cancel_drag_(false), data_(nullptr) {
|
||||
}
|
||||
|
||||
diff --git a/ui/base/dragdrop/drag_source_win.h b/ui/base/dragdrop/drag_source_win.h
|
||||
index 6051de2..ccb79aa 100644
|
||||
--- a/ui/base/dragdrop/drag_source_win.h
|
||||
+++ b/ui/base/dragdrop/drag_source_win.h
|
||||
@@ -20,11 +20,17 @@
|
||||
// drag-drop operation as the user mouses over other drop targets on their
|
||||
// system. This object tells Windows whether or not the drag should continue,
|
||||
// and supplies the appropriate cursors.
|
||||
-class UI_BASE_EXPORT DragSourceWin
|
||||
+class DragSourceWin
|
||||
: public Microsoft::WRL::RuntimeClass<
|
||||
Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
|
||||
IDropSource> {
|
||||
public:
|
||||
+ // Factory method to avoid exporting the class and all it derives from.
|
||||
+ static UI_BASE_EXPORT Microsoft::WRL::ComPtr<ui::DragSourceWin> Create();
|
||||
+
|
||||
+ // Use Create() to construct these objects. Direct calls to the constructor
|
||||
+ // are an error - it is only public because a WRL helper function creates the
|
||||
+ // objects.
|
||||
DragSourceWin();
|
||||
~DragSourceWin() override {}
|
||||
|
||||
diff --git a/ui/gfx/font_fallback_win.cc b/ui/gfx/font_fallback_win.cc
|
||||
index 17ac788..a05c7d7 100644
|
||||
--- a/ui/gfx/font_fallback_win.cc
|
||||
+++ b/ui/gfx/font_fallback_win.cc
|
||||
@@ -379,7 +379,7 @@
|
||||
DWRITE_READING_DIRECTION reading_direction =
|
||||
base::i18n::IsRTL() ? DWRITE_READING_DIRECTION_RIGHT_TO_LEFT
|
||||
: DWRITE_READING_DIRECTION_LEFT_TO_RIGHT;
|
||||
- if (FAILED(Microsoft::WRL::MakeAndInitialize<gfx::win::TextAnalysisSource>(
|
||||
+ if (FAILED(gfx::win::TextAnalysisSource::Create(
|
||||
text_analysis.GetAddressOf(), text, locale.c_str(),
|
||||
number_substitution.Get(), reading_direction))) {
|
||||
return false;
|
||||
diff --git a/ui/gfx/win/text_analysis_source.cc b/ui/gfx/win/text_analysis_source.cc
|
||||
index 74bfbc8..0f9779e 100644
|
||||
--- a/ui/gfx/win/text_analysis_source.cc
|
||||
+++ b/ui/gfx/win/text_analysis_source.cc
|
||||
@@ -9,6 +9,17 @@
|
||||
namespace gfx {
|
||||
namespace win {
|
||||
|
||||
+HRESULT TextAnalysisSource::Create(
|
||||
+ IDWriteTextAnalysisSource** text_analysis_out,
|
||||
+ const base::string16& text,
|
||||
+ const base::string16& locale_name,
|
||||
+ IDWriteNumberSubstitution* number_substitution,
|
||||
+ DWRITE_READING_DIRECTION reading_direction) {
|
||||
+ return Microsoft::WRL::MakeAndInitialize<gfx::win::TextAnalysisSource>(
|
||||
+ text_analysis_out, text, locale_name, number_substitution,
|
||||
+ reading_direction);
|
||||
+}
|
||||
+
|
||||
TextAnalysisSource::TextAnalysisSource() = default;
|
||||
TextAnalysisSource::~TextAnalysisSource() = default;
|
||||
|
||||
diff --git a/ui/gfx/win/text_analysis_source.h b/ui/gfx/win/text_analysis_source.h
|
||||
index 8307c9f..dd45d4d 100644
|
||||
--- a/ui/gfx/win/text_analysis_source.h
|
||||
+++ b/ui/gfx/win/text_analysis_source.h
|
||||
@@ -18,13 +18,23 @@
|
||||
// Implements an IDWriteTextAnalysisSource, describing a single pre-defined
|
||||
// chunk of text with a uniform locale, reading direction, and number
|
||||
// substitution.
|
||||
-class GFX_EXPORT TextAnalysisSource
|
||||
+class TextAnalysisSource
|
||||
: public Microsoft::WRL::RuntimeClass<
|
||||
Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
|
||||
IDWriteTextAnalysisSource> {
|
||||
public:
|
||||
- TextAnalysisSource();
|
||||
+ // Factory method to avoid exporting the class and all it derives from.
|
||||
+ static GFX_EXPORT HRESULT
|
||||
+ Create(IDWriteTextAnalysisSource** text_analysis_out,
|
||||
+ const base::string16& text,
|
||||
+ const base::string16& locale_name,
|
||||
+ IDWriteNumberSubstitution* number_substitution,
|
||||
+ DWRITE_READING_DIRECTION reading_direction);
|
||||
|
||||
+ // Use Create() to construct these objects. Direct calls to the constructor
|
||||
+ // are an error - it is only public because a WRL helper function creates the
|
||||
+ // objects.
|
||||
+ TextAnalysisSource();
|
||||
// IDWriteTextAnalysisSource:
|
||||
HRESULT STDMETHODCALLTYPE GetLocaleName(UINT32 text_position,
|
||||
UINT32* text_length,
|
||||
diff --git a/ui/gfx/win/text_analysis_source_unittest.cc b/ui/gfx/win/text_analysis_source_unittest.cc
|
||||
index 8d673d4..ed77d2d 100644
|
||||
--- a/ui/gfx/win/text_analysis_source_unittest.cc
|
||||
+++ b/ui/gfx/win/text_analysis_source_unittest.cc
|
||||
@@ -33,12 +33,12 @@
|
||||
kLocale, true /* ignoreUserOverride */,
|
||||
&number_substitution);
|
||||
|
||||
- mswr::MakeAndInitialize<TextAnalysisSource>(
|
||||
- &source_, kText, kLocale, number_substitution.Get(), kReadingDirection);
|
||||
+ TextAnalysisSource::Create(&source_, kText, kLocale,
|
||||
+ number_substitution.Get(), kReadingDirection);
|
||||
}
|
||||
|
||||
protected:
|
||||
- mswr::ComPtr<TextAnalysisSource> source_;
|
||||
+ mswr::ComPtr<IDWriteTextAnalysisSource> source_;
|
||||
|
||||
private:
|
||||
DISALLOW_COPY_AND_ASSIGN(TextAnalysisSourceTest);
|
||||
diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.cc b/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.cc
|
||||
index 1267b56..0871f43 100644
|
||||
--- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.cc
|
||||
+++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.cc
|
||||
@@ -40,7 +40,7 @@
|
||||
|
||||
base::WeakPtr<DesktopDragDropClientWin> alive(weak_factory_.GetWeakPtr());
|
||||
|
||||
- drag_source_ = Microsoft::WRL::Make<ui::DragSourceWin>();
|
||||
+ drag_source_ = ui::DragSourceWin::Create();
|
||||
Microsoft::WRL::ComPtr<ui::DragSourceWin> drag_source_copy = drag_source_;
|
||||
drag_source_copy->set_data(&data);
|
||||
ui::OSExchangeDataProviderWin::GetDataObjectImpl(data)
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
d3131378a4efcb4cdd710c4da969565ee9ebbcf6
|
||||
diff --git a/build/linux/sysroot_scripts/sysroots.json b/build/linux/sysroot_scripts/sysroots.json
|
||||
index e5f2f44cb3bc..243394ed7a2f 100644
|
||||
--- a/build/linux/sysroot_scripts/sysroots.json
|
||||
+++ b/build/linux/sysroot_scripts/sysroots.json
|
||||
@@ -12,8 +12,8 @@
|
||||
"Tarball": "debian_stretch_arm_sysroot.tar.xz"
|
||||
},
|
||||
"stretch_arm64": {
|
||||
- "Revision": "f5b4828fe6550e64f2b09951d07d93a1b9d17c5a",
|
||||
- "Sha1Sum": "5c1ae57960b399ac191511715321a26b436f8d0b",
|
||||
+ "Revision": "1e9c6777efb621794e8385ab9b4faf3546c29bf2",
|
||||
+ "Sha1Sum": "35fd438e9dfc39d75d1e03badc8b309e3ad94acd",
|
||||
"SysrootDir": "debian_stretch_arm64-sysroot",
|
||||
"Tarball": "debian_stretch_arm64_sysroot.tar.xz"
|
||||
},
|
||||
|
|
@ -1,479 +0,0 @@
|
|||
ea2ad20b708c3946995000dd4d0fa0f8ca2e2e0e
|
||||
diff --git a/build/linux/sysroot_scripts/packagelist.stretch.arm64 b/build/linux/sysroot_scripts/packagelist.stretch.arm64
|
||||
index 25437eaa8e21..d3985f67da15 100644
|
||||
--- a/build/linux/sysroot_scripts/packagelist.stretch.arm64
|
||||
+++ b/build/linux/sysroot_scripts/packagelist.stretch.arm64
|
||||
@@ -16,10 +16,12 @@ http://ftp.us.debian.org/debian/pool/main/c/cairo/libcairo2_1.14.8-1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/c/cairo/libcairo2-dev_1.14.8-1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/c/cairo/libcairo-gobject2_1.14.8-1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/c/cairo/libcairo-script-interpreter2_1.14.8-1_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/c/colord/libcolord2_1.3.3-2_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/c/cups/libcups2_2.2.1-8_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/c/cups/libcups2-dev_2.2.1-8_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/c/cups/libcupsimage2_2.2.1-8_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/c/cups/libcupsimage2-dev_2.2.1-8_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/d/db5.3/libdb5.3_5.3.28-12+deb9u1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/d/dbus-glib/libdbus-glib-1-2_0.108-2_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/d/dbus/libdbus-1-3_1.10.22-0+deb9u1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/d/dbus/libdbus-1-dev_1.10.22-0+deb9u1_arm64.deb
|
||||
@@ -29,6 +31,7 @@ http://ftp.us.debian.org/debian/pool/main/e/e2fsprogs/comerr-dev_2.1-1.43.4-2_ar
|
||||
http://ftp.us.debian.org/debian/pool/main/e/e2fsprogs/libcomerr2_1.43.4-2_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/e/elfutils/libelf1_0.168-1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/e/elfutils/libelf-dev_0.168-1_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/f/flac/libflac8_1.3.2-1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/f/fontconfig/libfontconfig1_2.11.0-6.7+b1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/f/fontconfig/libfontconfig1-dev_2.11.0-6.7+b1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/f/freetype/libfreetype6_2.6.3-3.2_arm64.deb
|
||||
@@ -48,6 +51,7 @@ http://ftp.us.debian.org/debian/pool/main/g/gconf/libgconf2-dev_3.2.6-4+b1_arm64
|
||||
http://ftp.us.debian.org/debian/pool/main/g/glib2.0/libglib2.0-0_2.50.3-2_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/g/glib2.0/libglib2.0-dev_2.50.3-2_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/g/gmp/libgmp10_6.1.2+dfsg-1_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/g/gmp/libgmp10_6.1.2+dfsg-1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/g/graphite2/libgraphite2-3_1.3.10-1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/g/graphite2/libgraphite2-dev_1.3.10-1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.31-2_arm64.deb
|
||||
@@ -58,6 +62,9 @@ http://ftp.us.debian.org/debian/pool/main/h/harfbuzz/libharfbuzz0b_1.4.2-1_arm64
|
||||
http://ftp.us.debian.org/debian/pool/main/h/harfbuzz/libharfbuzz-dev_1.4.2-1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/h/harfbuzz/libharfbuzz-gobject0_1.4.2-1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/h/harfbuzz/libharfbuzz-icu0_1.4.2-1_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/i/icu/libicu57_57.1-6_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/j/jbigkit/libjbig0_2.1-3.1+b2_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/j/json-glib/libjson-glib-1.0-0_1.2.6-1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/k/keyutils/libkeyutils1_1.5.9-9_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/k/krb5/krb5-multidev_1.15-1+deb9u1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/k/krb5/libgssapi-krb5-2_1.15-1+deb9u1_arm64.deb
|
||||
@@ -69,9 +76,11 @@ http://ftp.us.debian.org/debian/pool/main/k/krb5/libkdb5-8_1.15-1+deb9u1_arm64.d
|
||||
http://ftp.us.debian.org/debian/pool/main/k/krb5/libkrb5-3_1.15-1+deb9u1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/k/krb5/libkrb5-dev_1.15-1+deb9u1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/k/krb5/libkrb5support0_1.15-1+deb9u1_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/liba/libasyncns/libasyncns0_0.8-6_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libb/libbsd/libbsd0_0.8.3-1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libc/libcap2/libcap2_2.25-1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libc/libcap2/libcap-dev_2.25-1_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/libc/libcap-ng/libcap-ng0_0.7.7-3+b1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libd/libdatrie/libdatrie1_0.2.10-4+b1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libd/libdrm/libdrm2_2.4.74-1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libd/libdrm/libdrm-amdgpu1_2.4.74-1_arm64.deb
|
||||
@@ -88,16 +97,27 @@ http://ftp.us.debian.org/debian/pool/main/libg/libgnome-keyring/libgnome-keyring
|
||||
http://ftp.us.debian.org/debian/pool/main/libg/libgnome-keyring/libgnome-keyring-dev_3.12.0-1+b2_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libg/libgpg-error/libgpg-error0_1.26-2_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libg/libgpg-error/libgpg-error-dev_1.26-2_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/libi/libice/libice6_1.0.9-2_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/libi/libidl/libidl-2-0_0.8.14-4_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/libi/libidn/libidn11_1.33-1_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/libj/libjpeg-turbo/libjpeg62-turbo_1.5.1-2_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libj/libjsoncpp/libjsoncpp1_1.7.4-3_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libj/libjsoncpp/libjsoncpp-dev_1.7.4-3_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libn/libnss-db/libnss-db_2.2.3pre1-6+b1_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/libo/libogg/libogg0_1.3.2-1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libp/libp11/libp11-2_0.4.3-1_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/libp/libpciaccess/libpciaccess0_0.13.4-1+b2_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libp/libpng1.6/libpng16-16_1.6.28-1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libp/libpng1.6/libpng-dev_1.6.28-1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libp/libpthread-stubs/libpthread-stubs0-dev_0.3-4_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/libr/librest/librest-0.7-0_0.8.0-2_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libs/libselinux/libselinux1_2.6-3+b3_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/libs/libsm/libsm6_1.2.2-1+b3_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/libs/libsndfile/libsndfile1_1.0.27-3_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libt/libtasn1-6/libtasn1-6_4.10-1.1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libt/libthai/libthai0_0.1.26-1_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/libt/libthai/libthai0_0.1.26-1_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/libt/libtool/libltdl7_2.4.6-2_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libv/libva/libva1_1.7.3-2_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libv/libva/libva-dev_1.7.3-2_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libv/libva/libva-drm1_1.7.3-2_arm64.deb
|
||||
@@ -106,6 +126,8 @@ http://ftp.us.debian.org/debian/pool/main/libv/libva/libva-glx1_1.7.3-2_arm64.de
|
||||
http://ftp.us.debian.org/debian/pool/main/libv/libva/libva-tpi1_1.7.3-2_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libv/libva/libva-wayland1_1.7.3-2_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libv/libva/libva-x11-1_1.7.3-2_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/libv/libvorbis/libvorbis0a_1.3.5-4_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/libv/libvorbis/libvorbisenc2_1.3.5-4_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libx/libx11/libx11-6_1.6.4-3_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libx/libx11/libx11-dev_1.6.4-3_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libx/libx11/libx11-xcb1_1.6.4-3_arm64.deb
|
||||
@@ -123,6 +145,7 @@ http://ftp.us.debian.org/debian/pool/main/libx/libxcb/libxcb-render0-dev_1.12-1_
|
||||
http://ftp.us.debian.org/debian/pool/main/libx/libxcb/libxcb-shm0_1.12-1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libx/libxcb/libxcb-shm0-dev_1.12-1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libx/libxcb/libxcb-sync1_1.12-1_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/libx/libxcb/libxcb-xfixes0_1.12-1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libx/libxcomposite/libxcomposite1_0.4.4-2_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libx/libxcomposite/libxcomposite-dev_0.4.4-2_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libx/libxcursor/libxcursor1_1.1.14-1+b4_arm64.deb
|
||||
@@ -153,6 +176,9 @@ http://ftp.us.debian.org/debian/pool/main/libx/libxt/libxt-dev_1.1.5-1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libx/libxtst/libxtst6_1.2.3-1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libx/libxtst/libxtst-dev_1.2.3-1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.4-1+b2_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/l/lcms2/liblcms2-2_2.8-4_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/l/lz4/liblz4-1_0.0~r131-2+b1_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/l/lzo2/liblzo2-2_2.08-1.2+b2_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/m/mesa/libegl1-mesa_13.0.6-1+b2_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/m/mesa/libegl1-mesa-dev_13.0.6-1+b2_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/m/mesa/libgbm1_13.0.6-1+b2_arm64.deb
|
||||
@@ -162,8 +188,11 @@ http://ftp.us.debian.org/debian/pool/main/m/mesa/libgl1-mesa-glx_13.0.6-1+b2_arm
|
||||
http://ftp.us.debian.org/debian/pool/main/m/mesa/libglapi-mesa_13.0.6-1+b2_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/m/mesa/libwayland-egl1-mesa_13.0.6-1+b2_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/m/mesa/mesa-common-dev_13.0.6-1+b2_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/n/nettle/libhogweed4_3.3-1+b2_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/n/nettle/libnettle6_3.3-1+b2_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/n/nspr/libnspr4_4.12-6_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/n/nspr/libnspr4-dev_4.12-6_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/o/orbit2/liborbit-2-0_2.14.19-2+b1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/o/orbit2/liborbit2_2.14.19-2+b1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/p/p11-kit/libp11-kit0_0.23.3-2_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/p/pam/libpam0g_1.1.8-3.6_arm64.deb
|
||||
@@ -189,8 +218,15 @@ http://ftp.us.debian.org/debian/pool/main/p/pulseaudio/libpulse-mainloop-glib0_1
|
||||
http://ftp.us.debian.org/debian/pool/main/s/speech-dispatcher/libspeechd2_0.8.6-4+deb9u1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/s/speech-dispatcher/libspeechd-dev_0.8.6-4+deb9u1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/s/speech-dispatcher/speech-dispatcher_0.8.6-4+deb9u1_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/s/sqlite3/libsqlite3-0_3.16.2-5_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/s/systemd/libsystemd0_232-25+deb9u1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/s/systemd/libudev1_232-25+deb9u1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/s/systemd/libudev-dev_232-25+deb9u1_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/t/tcp-wrappers/libwrap0_7.6.q-26_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/u/unbound/libunbound2_1.6.0-3+deb9u1_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/u/util-linux/libblkid1_2.29.2-1_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/u/util-linux/libmount1_2.29.2-1_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/u/util-linux/libuuid1_2.29.2-1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/w/wayland/libwayland-client0_1.12.0-1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/w/wayland/libwayland-cursor0_1.12.0-1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/w/wayland/libwayland-dev_1.12.0-1_arm64.deb
|
||||
@@ -208,6 +244,8 @@ http://ftp.us.debian.org/debian/pool/main/x/x11proto-render/x11proto-render-dev_
|
||||
http://ftp.us.debian.org/debian/pool/main/x/x11proto-scrnsaver/x11proto-scrnsaver-dev_1.2.2-1_all.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/x/x11proto-xext/x11proto-xext-dev_7.3.0-1_all.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/x/x11proto-xinerama/x11proto-xinerama-dev_1.2.1-2_all.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/x/xft/libxft2_2.3.2-1+b2_arm64.deb
|
||||
+http://ftp.us.debian.org/debian/pool/main/x/xz-utils/liblzma5_5.2.2-1.2+b1_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/z/zlib/zlib1g_1.2.8.dfsg-5_arm64.deb
|
||||
http://ftp.us.debian.org/debian/pool/main/z/zlib/zlib1g-dev_1.2.8.dfsg-5_arm64.deb
|
||||
http://security.debian.org/pool/updates/main/b/bluez/libbluetooth3_5.43-2+deb9u1_arm64.deb
|
||||
@@ -225,9 +263,13 @@ http://security.debian.org/pool/updates/main/g/gnutls28/libgnutls-openssl27_3.5.
|
||||
http://security.debian.org/pool/updates/main/g/gnutls28/libgnutlsxx28_3.5.8-5+deb9u1_arm64.deb
|
||||
http://security.debian.org/pool/updates/main/libg/libgcrypt20/libgcrypt20_1.7.6-2+deb9u2_arm64.deb
|
||||
http://security.debian.org/pool/updates/main/libg/libgcrypt20/libgcrypt20-dev_1.7.6-2+deb9u2_arm64.deb
|
||||
+http://security.debian.org/pool/updates/main/libs/libsoup2.4/libsoup2.4-1_2.56.0-2+deb9u1_arm64.deb
|
||||
+http://security.debian.org/pool/updates/main/libs/libsoup2.4/libsoup-gnome2.4-1_2.56.0-2+deb9u1_arm64.deb
|
||||
+http://security.debian.org/pool/updates/main/libx/libxml2/libxml2_2.9.4+dfsg1-2.2+deb9u1_arm64.deb
|
||||
http://security.debian.org/pool/updates/main/l/linux/linux-libc-dev_4.9.30-2+deb9u5_arm64.deb
|
||||
http://security.debian.org/pool/updates/main/n/nss/libnss3_3.26.2-1.1+deb9u1_arm64.deb
|
||||
http://security.debian.org/pool/updates/main/n/nss/libnss3-dev_3.26.2-1.1+deb9u1_arm64.deb
|
||||
http://security.debian.org/pool/updates/main/o/openssl1.0/libssl1.0.2_1.0.2l-2+deb9u1_arm64.deb
|
||||
http://security.debian.org/pool/updates/main/o/openssl/libssl1.1_1.1.0f-3+deb9u1_arm64.deb
|
||||
http://security.debian.org/pool/updates/main/o/openssl/libssl-dev_1.1.0f-3+deb9u1_arm64.deb
|
||||
+http://security.debian.org/pool/updates/main/t/tiff/libtiff5_4.0.8-2+deb9u1_arm64.deb
|
||||
diff --git a/build/linux/sysroot_scripts/sysroot-creator-stretch.sh b/build/linux/sysroot_scripts/sysroot-creator-stretch.sh
|
||||
index d39745ac11b7..a0e50aba540a 100755
|
||||
--- a/build/linux/sysroot_scripts/sysroot-creator-stretch.sh
|
||||
+++ b/build/linux/sysroot_scripts/sysroot-creator-stretch.sh
|
||||
@@ -34,59 +34,68 @@ DEBIAN_PACKAGES="\
|
||||
krb5-multidev
|
||||
libasound2
|
||||
libasound2-dev
|
||||
+ libasyncns0
|
||||
libatk-bridge2.0-0
|
||||
libatk-bridge2.0-dev
|
||||
libatk1.0-0
|
||||
libatk1.0-dev
|
||||
+ libatomic1
|
||||
libatspi2.0-0
|
||||
libatspi2.0-dev
|
||||
libattr1
|
||||
+ libaudit1
|
||||
libavahi-client3
|
||||
libavahi-common3
|
||||
- libbluetooth3
|
||||
+ libblkid1
|
||||
libbluetooth-dev
|
||||
- libbrlapi0.6
|
||||
+ libbluetooth3
|
||||
libbrlapi-dev
|
||||
+ libbrlapi0.6
|
||||
libbsd0
|
||||
libc6
|
||||
libc6-dev
|
||||
- libcairo2
|
||||
- libcairo2-dev
|
||||
libcairo-gobject2
|
||||
libcairo-script-interpreter2
|
||||
+ libcairo2
|
||||
+ libcairo2-dev
|
||||
libcap-dev
|
||||
+ libcap-ng0
|
||||
libcap2
|
||||
+ libcolord2
|
||||
libcomerr2
|
||||
libcups2
|
||||
libcups2-dev
|
||||
libcupsimage2
|
||||
libcupsimage2-dev
|
||||
+ libdatrie1
|
||||
+ libdb5.3
|
||||
libdbus-1-3
|
||||
libdbus-1-dev
|
||||
libdbus-glib-1-2
|
||||
libdconf-dev
|
||||
libdconf1
|
||||
- libdrm2
|
||||
- libdrm-dev
|
||||
libdrm-amdgpu1
|
||||
+ libdrm-dev
|
||||
libdrm-nouveau2
|
||||
libdrm-radeon1
|
||||
+ libdrm2
|
||||
libegl1-mesa
|
||||
libegl1-mesa-dev
|
||||
- libelf1
|
||||
libelf-dev
|
||||
- libepoxy0
|
||||
+ libelf1
|
||||
libepoxy-dev
|
||||
+ libepoxy0
|
||||
libexpat1
|
||||
libexpat1-dev
|
||||
- libffi6
|
||||
libffi-dev
|
||||
+ libffi6
|
||||
+ libflac8
|
||||
libfontconfig1
|
||||
libfontconfig1-dev
|
||||
libfreetype6
|
||||
libfreetype6-dev
|
||||
- libgbm1
|
||||
libgbm-dev
|
||||
+ libgbm1
|
||||
libgcc-6-dev
|
||||
libgcc1
|
||||
libgconf-2-4
|
||||
@@ -101,16 +110,17 @@ DEBIAN_PACKAGES="\
|
||||
libglapi-mesa
|
||||
libglib2.0-0
|
||||
libglib2.0-dev
|
||||
- libgnome-keyring0
|
||||
+ libgmp10
|
||||
libgnome-keyring-dev
|
||||
+ libgnome-keyring0
|
||||
libgnutls-dane0
|
||||
libgnutls-openssl27
|
||||
- libgnutlsxx28
|
||||
libgnutls28-dev
|
||||
libgnutls30
|
||||
+ libgnutlsxx28
|
||||
libgomp1
|
||||
- libgpg-error0
|
||||
libgpg-error-dev
|
||||
+ libgpg-error0
|
||||
libgraphite2-3
|
||||
libgraphite2-dev
|
||||
libgssapi-krb5-2
|
||||
@@ -119,13 +129,20 @@ DEBIAN_PACKAGES="\
|
||||
libgtk-3-dev
|
||||
libgtk2.0-0
|
||||
libgtk2.0-dev
|
||||
- libharfbuzz0b
|
||||
libharfbuzz-dev
|
||||
libharfbuzz-gobject0
|
||||
libharfbuzz-icu0
|
||||
- libatomic1
|
||||
- libjsoncpp1
|
||||
+ libharfbuzz0b
|
||||
+ libhogweed4
|
||||
+ libice6
|
||||
+ libicu57
|
||||
+ libidl-2-0
|
||||
+ libidn11
|
||||
+ libjbig0
|
||||
+ libjpeg62-turbo
|
||||
+ libjson-glib-1.0-0
|
||||
libjsoncpp-dev
|
||||
+ libjsoncpp1
|
||||
libk5crypto3
|
||||
libkadm5clnt-mit11
|
||||
libkadm5srv-mit11
|
||||
@@ -134,11 +151,20 @@ DEBIAN_PACKAGES="\
|
||||
libkrb5-3
|
||||
libkrb5-dev
|
||||
libkrb5support0
|
||||
+ liblcms2-2
|
||||
+ libltdl7
|
||||
+ liblz4-1
|
||||
+ liblzma5
|
||||
+ liblzo2-2
|
||||
+ libmount1
|
||||
+ libnettle6
|
||||
libnspr4
|
||||
libnspr4-dev
|
||||
+ libnss-db
|
||||
libnss3
|
||||
libnss3-dev
|
||||
- libnss-db
|
||||
+ libogg0
|
||||
+ liborbit-2-0
|
||||
liborbit2
|
||||
libp11-2
|
||||
libp11-kit0
|
||||
@@ -146,37 +172,48 @@ DEBIAN_PACKAGES="\
|
||||
libpam0g-dev
|
||||
libpango-1.0-0
|
||||
libpango1.0-dev
|
||||
- libpangoft2-1.0-0
|
||||
libpangocairo-1.0-0
|
||||
+ libpangoft2-1.0-0
|
||||
libpangox-1.0-0
|
||||
libpangoxft-1.0-0
|
||||
- libpci3
|
||||
libpci-dev
|
||||
- libpcre3
|
||||
+ libpci3
|
||||
+ libpciaccess0
|
||||
libpcre16-3
|
||||
- libpcre32-3
|
||||
+ libpcre3
|
||||
libpcre3-dev
|
||||
+ libpcre32-3
|
||||
libpcrecpp0v5
|
||||
libpixman-1-0
|
||||
libpixman-1-dev
|
||||
- libpng16-16
|
||||
libpng-dev
|
||||
+ libpng16-16
|
||||
libpthread-stubs0-dev
|
||||
- libpulse0
|
||||
libpulse-dev
|
||||
libpulse-mainloop-glib0
|
||||
+ libpulse0
|
||||
+ librest-0.7-0
|
||||
libselinux1
|
||||
- libspeechd2
|
||||
+ libsm6
|
||||
+ libsndfile1
|
||||
+ libsoup-gnome2.4-1
|
||||
+ libsoup2.4-1
|
||||
libspeechd-dev
|
||||
+ libspeechd2
|
||||
+ libsqlite3-0
|
||||
+ libssl-dev
|
||||
libssl1.0.2
|
||||
libssl1.1
|
||||
- libssl-dev
|
||||
- libstdc++6
|
||||
libstdc++-6-dev
|
||||
+ libstdc++6
|
||||
+ libsystemd0
|
||||
libtasn1-6
|
||||
+ libthai0
|
||||
+ libtiff5
|
||||
libudev-dev
|
||||
libudev1
|
||||
- libva1
|
||||
+ libunbound2
|
||||
+ libuuid1
|
||||
libva-dev
|
||||
libva-drm1
|
||||
libva-egl1
|
||||
@@ -184,58 +221,64 @@ DEBIAN_PACKAGES="\
|
||||
libva-tpi1
|
||||
libva-wayland1
|
||||
libva-x11-1
|
||||
+ libva1
|
||||
+ libvorbis0a
|
||||
+ libvorbisenc2
|
||||
libwayland-client0
|
||||
libwayland-cursor0
|
||||
libwayland-dev
|
||||
libwayland-egl1-mesa
|
||||
libwayland-server0
|
||||
+ libwrap0
|
||||
libx11-6
|
||||
libx11-dev
|
||||
- libx11-xcb1
|
||||
libx11-xcb-dev
|
||||
- libxau6
|
||||
- libaudit1
|
||||
+ libx11-xcb1
|
||||
libxau-dev
|
||||
- libxcb1
|
||||
- libxcb1-dev
|
||||
+ libxau6
|
||||
libxcb-dri2-0
|
||||
libxcb-dri3-0
|
||||
libxcb-glx0
|
||||
libxcb-present0
|
||||
libxcb-render0
|
||||
libxcb-render0-dev
|
||||
- libxcb-sync1
|
||||
libxcb-shm0
|
||||
libxcb-shm0-dev
|
||||
- libxcomposite1
|
||||
+ libxcb-sync1
|
||||
+ libxcb-xfixes0
|
||||
+ libxcb1
|
||||
+ libxcb1-dev
|
||||
libxcomposite-dev
|
||||
- libxcursor1
|
||||
+ libxcomposite1
|
||||
libxcursor-dev
|
||||
- libxdamage1
|
||||
+ libxcursor1
|
||||
libxdamage-dev
|
||||
- libxdmcp6
|
||||
+ libxdamage1
|
||||
libxdmcp-dev
|
||||
- libxext6
|
||||
+ libxdmcp6
|
||||
libxext-dev
|
||||
- libxfixes3
|
||||
+ libxext6
|
||||
libxfixes-dev
|
||||
- libxi6
|
||||
+ libxfixes3
|
||||
+ libxft2
|
||||
libxi-dev
|
||||
- libxinerama1
|
||||
+ libxi6
|
||||
libxinerama-dev
|
||||
- libxkbcommon0
|
||||
+ libxinerama1
|
||||
libxkbcommon-dev
|
||||
- libxrandr2
|
||||
+ libxkbcommon0
|
||||
+ libxml2
|
||||
libxrandr-dev
|
||||
- libxrender1
|
||||
+ libxrandr2
|
||||
libxrender-dev
|
||||
+ libxrender1
|
||||
libxshmfence1
|
||||
- libxss1
|
||||
libxss-dev
|
||||
- libxt6
|
||||
+ libxss1
|
||||
libxt-dev
|
||||
- libxtst6
|
||||
+ libxt6
|
||||
libxtst-dev
|
||||
+ libxtst6
|
||||
libxxf86vm1
|
||||
linux-libc-dev
|
||||
mesa-common-dev
|
||||
@@ -283,7 +326,6 @@ DEBIAN_PACKAGES_ARM="
|
||||
|
||||
DEBIAN_PACKAGES_ARM64="
|
||||
libasan3
|
||||
- libdatrie1
|
||||
libdrm-freedreno1
|
||||
libdrm-tegra0
|
||||
libgmp10
|
||||
diff --git a/build/linux/sysroot_scripts/sysroots.json b/build/linux/sysroot_scripts/sysroots.json
|
||||
index 8478178b8dc3..e5f2f44cb3bc 100644
|
||||
--- a/build/linux/sysroot_scripts/sysroots.json
|
||||
+++ b/build/linux/sysroot_scripts/sysroots.json
|
||||
@@ -12,8 +12,8 @@
|
||||
"Tarball": "debian_stretch_arm_sysroot.tar.xz"
|
||||
},
|
||||
"stretch_arm64": {
|
||||
- "Revision": "62a209c44d63af015bfd7b2bccb3ec37b08686e3",
|
||||
- "Sha1Sum": "f2e564cd96221820a0bd241d34158dfb24f6a220",
|
||||
+ "Revision": "f5b4828fe6550e64f2b09951d07d93a1b9d17c5a",
|
||||
+ "Sha1Sum": "5c1ae57960b399ac191511715321a26b436f8d0b",
|
||||
"SysrootDir": "debian_stretch_arm64-sysroot",
|
||||
"Tarball": "debian_stretch_arm64_sysroot.tar.xz"
|
||||
},
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
diff --git a/gpu/ipc/in_process_command_buffer.cc b/gpu/ipc/in_process_command_buffer.cc
|
||||
index f5ac52f17443..414a7f647028 100644
|
||||
--- a/gpu/ipc/in_process_command_buffer.cc
|
||||
+++ b/gpu/ipc/in_process_command_buffer.cc
|
||||
@@ -1026,6 +1026,8 @@ void InProcessCommandBuffer::DidCreateAcceleratedSurfaceChildWindow(
|
||||
SurfaceHandle parent_window,
|
||||
SurfaceHandle child_window) {
|
||||
::SetParent(child_window, parent_window);
|
||||
+ ::SetWindowPos(child_window, HWND_BOTTOM, 0, 0, 0, 0,
|
||||
+ SWP_NOMOVE | SWP_NOSIZE);
|
||||
}
|
||||
#endif
|
||||
|
||||
diff --git a/ui/gfx/win/rendering_window_manager.cc b/ui/gfx/win/rendering_window_manager.cc
|
||||
index a0528ecf9ab7..72ef021bedbe 100644
|
||||
--- a/ui/gfx/win/rendering_window_manager.cc
|
||||
+++ b/ui/gfx/win/rendering_window_manager.cc
|
||||
@@ -49,6 +49,7 @@ void RenderingWindowManager::DoSetParentOnChild(HWND parent) {
|
||||
}
|
||||
|
||||
::SetParent(child, parent);
|
||||
+ ::SetWindowPos(child, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
|
||||
}
|
||||
|
||||
void RenderingWindowManager::UnregisterParent(HWND parent) {
|
||||
Загрузка…
Ссылка в новой задаче