| commit | c621f6274616b050108d3cbb3b9d24bfa2c56233 | [log] [tgz] |
|---|---|---|
| author | Halton Huo <halton.huo@gmail.com> | Thu Jul 12 02:49:50 2018 |
| committer | Commit Bot <commit-bot@chromium.org> | Thu Jul 12 02:49:50 2018 |
| tree | 6fda40fb44142fea3aad8f6ad964addb34794b6b | |
| parent | c70c93c4855cbbdd5c9f05fe2f383599be7a0eb5 [diff] |
Fix debain package issue for ARM64. Bug: 862500 Change-Id: Ib456bdb3773cf9f50d7de85275804700c807f18e Reviewed-on: https://chromium-review.googlesource.com/1134578 Reviewed-by: Thomas Anderson <thomasanderson@chromium.org> Commit-Queue: Thomas Anderson <thomasanderson@chromium.org> Cr-Commit-Position: refs/heads/master@{#574469}
diff --git a/chrome/installer/linux/debian/build.sh b/chrome/installer/linux/debian/build.sh index 8234caf..306b59c 100755 --- a/chrome/installer/linux/debian/build.sh +++ b/chrome/installer/linux/debian/build.sh
@@ -278,6 +278,9 @@ arm ) export ARCHITECTURE="armhf" ;; + arm64 ) + export ARCHITECTURE="arm64" + ;; ia32 ) export ARCHITECTURE="i386" ;;
diff --git a/chrome/installer/linux/debian/calculate_package_deps.py b/chrome/installer/linux/debian/calculate_package_deps.py index 2bef1f6..84fdc25 100755 --- a/chrome/installer/linux/debian/calculate_package_deps.py +++ b/chrome/installer/linux/debian/calculate_package_deps.py
@@ -41,6 +41,9 @@ elif arch == 'arm': cmd.extend(['-l%s/usr/lib/arm-linux-gnueabihf' % sysroot, '-l%s/lib/arm-linux-gnueabihf' % sysroot]) +elif arch == 'arm64': + cmd.extend(['-l%s/usr/lib/aarch64-linux-gnu' % sysroot, + '-l%s/lib/aarch64-linux-gnu' % sysroot]) elif arch == 'mipsel': cmd.extend(['-l%s/usr/lib/mipsel-linux-gnu' % sysroot, '-l%s/lib/mipsel-linux-gnu' % sysroot])