native_client_sdk/src/tools/getos.py - Issue 417763002: [NaCl SDK] Silence objdump warning when building w/ Chrome dev/beta.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 417763002: [NaCl SDK] Silence objdump warning when building w/ Chrome dev/beta. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 5 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:

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 89b6c5790054999739fdaa77a94110376d49ae0e..b7eca3b0ce53df92cb121fe5cd685d5e1744a5da 100755

--- a/native_client_sdk/src/tools/getos.py

+++ b/native_client_sdk/src/tools/getos.py

@@ -144,7 +144,9 @@ def GetNaClArch(platform):

# If CHROME_PATH is set to point to google-chrome or google-chrome

# was found in the PATH and we are running on UNIX then google-chrome

# is a bash script that points to 'chrome' in the same folder.

- if os.path.basename(chrome_path) == 'google-chrome':

+ #

+ # When running beta or dev branch, the name is google-chrome-{beta,dev}.

+ if os.path.basename(chrome_path).startswith('google-chrome'):

chrome_path = os.path.join(os.path.dirname(chrome_path), 'chrome')

Sam Clegg 2014/07/23 19:57:44 Can we also check that it exists and is executable

binji 2014/07/23 20:58:28 Done.

try:

« no previous file with comments | « no previous file | no next file » | no next file with comments »