summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-12 20:33:54 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-12 20:33:54 +0000
commit01a9860db1e1ca86986b4e2b9254c6ef4b4e4586 (patch)
tree8e3fad0532776c8ce03633a37c08c3d819b917d0 /build
parente0ab447ef3fca38572c9839efa83abce43a6aab0 (diff)
downloadchromium_src-01a9860db1e1ca86986b4e2b9254c6ef4b4e4586.zip
chromium_src-01a9860db1e1ca86986b4e2b9254c6ef4b4e4586.tar.gz
chromium_src-01a9860db1e1ca86986b4e2b9254c6ef4b4e4586.tar.bz2
Linux: Call the install-debian-sysroot scripts directly instead of via a wrapper, now that the scripts on no longer internal.
BUG=246404 Review URL: https://chromiumcodereview.appspot.com/16507016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205918 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rwxr-xr-xbuild/linux/install-debian.wheezy.sysroot.wrapper.py45
1 files changed, 0 insertions, 45 deletions
diff --git a/build/linux/install-debian.wheezy.sysroot.wrapper.py b/build/linux/install-debian.wheezy.sysroot.wrapper.py
deleted file mode 100755
index b7b86a2..0000000
--- a/build/linux/install-debian.wheezy.sysroot.wrapper.py
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env python
-# Copyright (c) 2013 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This wrapper script runs the Debian sysroot installation scripts, if they
-# exist.
-#
-# The script is a no-op except for linux users who have the following in their
-# GYP_DEFINES:
-#
-# * branding=Chrome
-# * buildtype=Official
-#
-# and not:
-#
-# * chromeos=1
-
-import os.path
-import subprocess
-import sys
-
-def main():
- if sys.platform != 'linux2':
- return 0
-
- SRC_DIR = os.path.dirname(os.path.dirname(os.path.dirname(
- os.path.realpath(__file__))))
- SCRIPT_FILE = os.path.join(SRC_DIR,
- 'chrome',
- 'installer',
- 'linux',
- 'sysroot_scripts',
- 'install-debian.wheezy.sysroot.py')
- if os.path.exists(SCRIPT_FILE):
- ret = subprocess.call([SCRIPT_FILE, '--linux-only', '--arch=amd64'])
- if ret != 0:
- return ret
- ret = subprocess.call([SCRIPT_FILE, '--linux-only', '--arch=i386'])
- if ret != 0:
- return ret
- return 0
-
-if __name__ == '__main__':
- sys.exit(main())