Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(28)

Unified Diff: native_client_sdk/src/tools/getos.py

Issue 118553007: [NaCl SDK] Use nacl_config.py in common.mk build system. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « native_client_sdk/src/tools/common.mk ('k') | native_client_sdk/src/tools/nacl_config.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: native_client_sdk/src/tools/getos.py
diff --git a/native_client_sdk/src/tools/getos.py b/native_client_sdk/src/tools/getos.py
index 7b387c091a367a188b23b2d9911f00ef03c9413a..89b6c5790054999739fdaa77a94110376d49ae0e 100755
--- a/native_client_sdk/src/tools/getos.py
+++ b/native_client_sdk/src/tools/getos.py
@@ -172,35 +172,6 @@ def GetNaClArch(platform):
return 'x86_32'
-def GetLoaderPath(platform):
- sdk_path = GetSDKPath()
- arch = GetNaClArch(platform)
- sel_ldr = os.path.join(sdk_path, 'tools', 'sel_ldr_' + arch)
- if not os.path.exists(sel_ldr):
- raise Error("sel_ldr not found: %s" % sel_ldr)
- return sel_ldr
-
-
-def GetHelperPath(platform):
- sdk_path = GetSDKPath()
- if platform != 'linux':
- return ''
- arch = GetNaClArch(platform)
- helper = os.path.join(sdk_path, 'tools', 'nacl_helper_bootstrap_' + arch)
- if not os.path.exists(helper):
- raise Error("helper not found: %s" % helper)
- return helper
-
-
-def GetIrtBinPath(platform):
- sdk_path = GetSDKPath()
- arch = GetNaClArch(platform)
- irt = os.path.join(sdk_path, 'tools', 'irt_core_%s.nexe' % arch)
- if not os.path.exists(irt):
- raise Error("irt not found: %s" % irt)
- return irt
-
-
def ParseVersion(version):
if '.' in version:
version = version.split('.')
@@ -222,12 +193,6 @@ def main(args):
'then $PATH).')
parser.add_option('--nacl-arch', action='store_true',
help='Print architecture used by NaCl on the current machine.')
- parser.add_option('--helper', action='store_true',
- help='Print chrome helper path.')
- parser.add_option('--irtbin', action='store_true',
- help='Print irt binary path.')
- parser.add_option('--loader', action='store_true',
- help='Print NEXE loader path.')
parser.add_option('--sdk-version', action='store_true',
help='Print major version of the NaCl SDK.')
parser.add_option('--sdk-revision', action='store_true',
@@ -253,12 +218,6 @@ def main(args):
out = GetNaClArch(platform)
elif options.chrome:
out = GetChromePath(platform)
- elif options.helper:
- out = GetHelperPath(platform)
- elif options.irtbin:
- out = GetIrtBinPath(platform)
- elif options.loader:
- out = GetLoaderPath(platform)
elif options.sdk_version:
out = GetSDKVersion()[0]
elif options.sdk_revision:
« no previous file with comments | « native_client_sdk/src/tools/common.mk ('k') | native_client_sdk/src/tools/nacl_config.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698