diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | DEPS | 12 | ||||
| -rw-r--r-- | build/linux/bin/eu-strip.sha1 | 1 | ||||
| -rw-r--r-- | chrome/chrome_installer.gypi | 6 | ||||
| -rw-r--r-- | chrome/installer/linux/common/installer.include | 4 |
5 files changed, 22 insertions, 2 deletions
@@ -56,6 +56,7 @@ v8.log /build/util/LASTCHANGE* /build/util/support /build/x64/ +/build/linux/bin/eu-strip # The Chrome OS build creates a /c symlink due to http://crbug.com/54866. /c /ceee/internal/ @@ -741,6 +741,18 @@ hooks = [ "-s", "src/third_party/clang_format/bin/linux/clang-format.sha1", ], }, + # Pull eu-strip binaries using checked-in hashes. + { + "name": "eu-strip", + "pattern": "src/build/linux/bin/eu-strip.sha1", + "action": [ "download_from_google_storage", + "--no_resume", + "--platform=linux*", + "--no_auth", + "--bucket", "chromium-eu-strip", + "-s", "src/build/linux/bin/eu-strip.sha1", + ], + }, { # A change to a .gyp, .gypi, or to GYP itself should run the generator. "name": "gyp", diff --git a/build/linux/bin/eu-strip.sha1 b/build/linux/bin/eu-strip.sha1 new file mode 100644 index 0000000..43f290a --- /dev/null +++ b/build/linux/bin/eu-strip.sha1 @@ -0,0 +1 @@ +0a9b8f68615ce388b65201e6d22da7a9cf2e729c
\ No newline at end of file diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi index 4561054..9de1392 100644 --- a/chrome/chrome_installer.gypi +++ b/chrome/chrome_installer.gypi @@ -567,6 +567,9 @@ '<(PRODUCT_DIR)/libwidevinecdmadapter.so', '<(PRODUCT_DIR)/libwidevinecdm.so', ], + 'packaging_files_common': [ + '<(DEPTH)/build/linux/bin/eu-strip', + ], }], ['target_arch=="x64"', { 'deb_arch': 'amd64', @@ -576,6 +579,9 @@ '<(PRODUCT_DIR)/libwidevinecdmadapter.so', '<(PRODUCT_DIR)/libwidevinecdm.so', ], + 'packaging_files_common': [ + '<!(which eu-strip)', + ], }], ['target_arch=="arm"', { 'deb_arch': 'arm', diff --git a/chrome/installer/linux/common/installer.include b/chrome/installer/linux/common/installer.include index 77aec34..962fd86 100644 --- a/chrome/installer/linux/common/installer.include +++ b/chrome/installer/linux/common/installer.include @@ -115,7 +115,7 @@ stage_install_common() { # We need to add the debug link so gdb knows to look for the symbols. DEBUGFILE="${BUILDDIR}/${PROGNAME}.debug" STRIPPEDFILE="${BUILDDIR}/${PROGNAME}.stripped" - eu-strip -o "${STRIPPEDFILE}" -f "${DEBUGFILE}" "${BUILDDIR}/${PROGNAME}" + "${BUILDDIR}/installer/common/eu-strip" -o "${STRIPPEDFILE}" -f "${DEBUGFILE}" "${BUILDDIR}/${PROGNAME}" install -m 755 "${STRIPPEDFILE}" "${STAGEDIR}/${INSTALLDIR}/${PROGNAME}" rm "${DEBUGFILE}" "${STRIPPEDFILE}" @@ -186,7 +186,7 @@ stage_install_common() { if [ -f "${buildfile}" ]; then strippedfile="${buildfile}.stripped" debugfile="${buildfile}.debug" - eu-strip -o "${strippedfile}" -f "${debugfile}" "${buildfile}" + "${BUILDDIR}/installer/common/eu-strip" -o "${strippedfile}" -f "${debugfile}" "${buildfile}" install -m 755 "${strippedfile}" "${STAGEDIR}/${INSTALLDIR}/${file}" fi done |