From 28f11516fe6d2f338b6ac7cc53739b6751904b4c Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 22 May 2017 16:52:40 +0900
Subject: [PATCH] Build with jessie sysroot image

---
 .gitignore                |  7 ++++---
 script/bootstrap.py       |  3 ++-
 script/install-sysroot.py |  2 +-
 script/lib/util.py        |  4 ++--
 script/sysroots.json      | 20 ++++++++++----------
 toolchain.gypi            |  9 ++++++---
 6 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3f1279eebf42..dbe565b8d4b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,9 +6,10 @@
 /external_binaries/
 /out/
 /vendor/download/
-/vendor/debian_wheezy_amd64-sysroot/
-/vendor/debian_wheezy_arm-sysroot/
-/vendor/debian_wheezy_i386-sysroot/
+/vendor/debian_jessie_amd64-sysroot/
+/vendor/debian_jessie_arm-sysroot/
+/vendor/debian_jessie_arm64-sysroot/
+/vendor/debian_jessie_i386-sysroot/
 /vendor/python_26/
 /vendor/npm/
 /vendor/llvm/
diff --git a/script/bootstrap.py b/script/bootstrap.py
index 0feee9b50028..cf630a14ac44 100755
--- a/script/bootstrap.py
+++ b/script/bootstrap.py
@@ -227,7 +227,8 @@ def download_sysroot(target_arch):
     target_arch = 'amd64'
   execute_stdout([sys.executable,
                   os.path.join(SOURCE_ROOT, 'script', 'install-sysroot.py'),
-                  '--arch', target_arch])
+                  '--arch', target_arch],
+                  cwd=VENDOR_DIR)
 
 def create_chrome_version_h():
   version_file = os.path.join(VENDOR_DIR, 'libchromiumcontent', 'VERSION')
diff --git a/script/install-sysroot.py b/script/install-sysroot.py
index 9d98578b8e68..46c7f066cbdc 100755
--- a/script/install-sysroot.py
+++ b/script/install-sysroot.py
@@ -121,7 +121,7 @@ def InstallSysroot(target_platform, target_arch):
   revision = sysroot_dict['Revision']
   tarball_filename = sysroot_dict['Tarball']
   tarball_sha1sum = sysroot_dict['Sha1Sum']
-  sysroot = os.path.join(linux_dir, sysroot_dict['SysrootDir'])
+  sysroot = os.path.join(linux_dir, 'vendor', sysroot_dict['SysrootDir'])
 
   url = '%s/%s/%s/%s' % (URL_PREFIX, URL_PATH, revision, tarball_filename)
 
diff --git a/script/lib/util.py b/script/lib/util.py
index cff7e94a0423..b40ccd0cce61 100644
--- a/script/lib/util.py
+++ b/script/lib/util.py
@@ -170,11 +170,11 @@ def execute(argv, env=os.environ):
     raise e
 
 
-def execute_stdout(argv, env=os.environ):
+def execute_stdout(argv, env=os.environ, cwd=None):
   if is_verbose_mode():
     print ' '.join(argv)
     try:
-      subprocess.check_call(argv, env=env)
+      subprocess.check_call(argv, env=env, cwd=cwd)
     except subprocess.CalledProcessError as e:
       print e.output
       raise e
diff --git a/script/sysroots.json b/script/sysroots.json
index a3db89de6c7e..caa04a45ff90 100644
--- a/script/sysroots.json
+++ b/script/sysroots.json
@@ -1,31 +1,31 @@
 {
     "jessie_amd64": {
-        "Revision": "d18016aaa5283f85bd8c722c42e55d2f5f13384e",
-        "Sha1Sum": "82c0c27b1cbb7a7c2e496aeb6d9f6e28373126db",
+        "Revision": "b6dd965b53da1e379e784d8450811c583547e271",
+        "Sha1Sum": "2b0063007eb89ba915dac19223d772e306406a8d",
         "SysrootDir": "debian_jessie_amd64-sysroot",
         "Tarball": "debian_jessie_amd64_sysroot.tgz"
     },
     "jessie_arm": {
-        "Revision": "d18016aaa5283f85bd8c722c42e55d2f5f13384e",
-        "Sha1Sum": "c41fd22e33afe9a6037ecac8880e40f99a6a2522",
+        "Revision": "b6dd965b53da1e379e784d8450811c583547e271",
+        "Sha1Sum": "3c3d7830fe1cf97497a8cb66dfa416e5d5e6b4cd",
         "SysrootDir": "debian_jessie_arm-sysroot",
         "Tarball": "debian_jessie_arm_sysroot.tgz"
     },
     "jessie_arm64": {
-        "Revision": "d18016aaa5283f85bd8c722c42e55d2f5f13384e",
-        "Sha1Sum": "a8579b53d7e6c14cd6f15bf9f25d3a938755d834",
+        "Revision": "b6dd965b53da1e379e784d8450811c583547e271",
+        "Sha1Sum": "cc1fb0f0598d8b9bc56459ec980599cafbf2867c",
         "SysrootDir": "debian_jessie_arm64-sysroot",
         "Tarball": "debian_jessie_arm64_sysroot.tgz"
     },
     "jessie_i386": {
-        "Revision": "d18016aaa5283f85bd8c722c42e55d2f5f13384e",
-        "Sha1Sum": "85c86f16036e952e33a70ae74e37775f26c54d48",
+        "Revision": "b6dd965b53da1e379e784d8450811c583547e271",
+        "Sha1Sum": "74d967eda22f754334afdd132dc3f157d905134e",
         "SysrootDir": "debian_jessie_i386-sysroot",
         "Tarball": "debian_jessie_i386_sysroot.tgz"
     },
     "jessie_mips": {
-        "Revision": "d18016aaa5283f85bd8c722c42e55d2f5f13384e",
-        "Sha1Sum": "b6d4cdb21fb61c5669eea5135f7c87a19fc16876",
+        "Revision": "b6dd965b53da1e379e784d8450811c583547e271",
+        "Sha1Sum": "2ab2669d422f5cdfcc0bef51ede260db7f197164",
         "SysrootDir": "debian_jessie_mips-sysroot",
         "Tarball": "debian_jessie_mips_sysroot.tgz"
     }
diff --git a/toolchain.gypi b/toolchain.gypi
index 1c5f8a713518..f00016651c02 100644
--- a/toolchain.gypi
+++ b/toolchain.gypi
@@ -50,13 +50,16 @@
             ['target_arch=="arm"', {
               # sysroot needs to be an absolute path otherwise it generates
               # incorrect results when passed to pkg-config
-              'sysroot%': '<(source_root)/vendor/debian_wheezy_arm-sysroot',
+              'sysroot%': '<(source_root)/vendor/debian_jessie_arm-sysroot',
+            }],
+            ['target_arch=="arm64"', {
+              'sysroot%': '<(source_root)/vendor/debian_jessie_arm64-sysroot',
             }],
             ['target_arch=="ia32"', {
-              'sysroot%': '<(source_root)/vendor/debian_wheezy_i386-sysroot',
+              'sysroot%': '<(source_root)/vendor/debian_jessie_i386-sysroot',
             }],
             ['target_arch=="x64"', {
-              'sysroot%': '<(source_root)/vendor/debian_wheezy_amd64-sysroot',
+              'sysroot%': '<(source_root)/vendor/debian_jessie_amd64-sysroot',
             }],
           ],
         },