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

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

Issue 1531683006: [NaCl SDK] Remove references to naclports bundle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
Index: native_client_sdk/src/tools/create_nmf.py
diff --git a/native_client_sdk/src/tools/create_nmf.py b/native_client_sdk/src/tools/create_nmf.py
index c1fe50cadf3dd50b633c9fe5b9054cbe670cd211..7139444894d5bc0995b44321b976c7e6d27ce268 100755
--- a/native_client_sdk/src/tools/create_nmf.py
+++ b/native_client_sdk/src/tools/create_nmf.py
@@ -507,10 +507,10 @@ def FindObjdumpExecutable():
def GetDefaultLibPath(config):
- """Derive default library path to use when searching for shared
- objects. This currently include the toolchain library folders
- as well as the top level SDK lib folder and the naclports lib
- folder. We include both 32-bit and 64-bit library paths.
+ """Derive default library path.
+
+ This path is used when searching for shared objects. This currently includes
+ the toolchain library folders and the top level SDK lib folder.
"""
sdk_root = GetSDKRoot()
@@ -520,7 +520,7 @@ def GetDefaultLibPath(config):
'toolchain/%s_x86_glibc/x86_64-nacl/lib' % osname,
'toolchain/%s_x86_glibc/x86_64-nacl/lib32' % osname,
'toolchain/%s_arm_glibc/arm-nacl/lib' % osname,
- # naclports installed libraries
+ # user installed libraries (used by webports)
'toolchain/%s_x86_glibc/x86_64-nacl/usr/lib' % osname,
'toolchain/%s_x86_glibc/i686-nacl/usr/lib' % osname,
'toolchain/%s_arm_glibc/arm-nacl/usr/lib' % osname,
@@ -528,10 +528,6 @@ def GetDefaultLibPath(config):
'lib/glibc_x86_32/%s' % config,
'lib/glibc_x86_64/%s' % config,
'lib/glibc_arm/%s' % config,
- # naclports bundle libraries
- 'ports/lib/glibc_x86_32/%s' % config,
- 'ports/lib/glibc_x86_64/%s' % config,
- 'ports/lib/glibc_arm/%s' % config,
]
# In some cases (e.g. ASAN, TSAN, STANDALONE) the name of the configuration
« no previous file with comments | « native_client_sdk/src/gonacl_appengine/static/lua/index.html ('k') | native_client_sdk/src/tools/tests/create_nmf_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698