Skip to content

Commit

Permalink
Remove default in-memory filename strings for PNaCl llc and ld.
Browse files Browse the repository at this point in the history
It has now been a long time since we pushed a version of the
translator that had the filenames specified in the pnacl.json file.
Hopefully having pushed it for a long time means that any
beta testers have gotten the upgraded version.

BUG=cleanup
R=eliben@chromium.org

Review URL: https://codereview.chromium.org/19637006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212414 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
jvoung@google.com committed Jul 18, 2013
1 parent ce8a476 commit 841ce9e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 13 deletions.
3 changes: 0 additions & 3 deletions ppapi/native_client/src/trusted/plugin/pnacl_resources.cc
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ namespace plugin {
static const char kPnaclComponentScheme[] = "pnacl-component://";
const char PnaclUrls::kResourceInfoUrl[] = "pnacl.json";

const char PnaclResources::kDefaultLlcName[] = "llc.nexe";
const char PnaclResources::kDefaultLdName[] = "ld.nexe";

nacl::string PnaclUrls::GetBaseUrl() {
return nacl::string(kPnaclComponentScheme);
}
Expand Down
11 changes: 1 addition & 10 deletions ppapi/native_client/src/trusted/plugin/pnacl_resources.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,7 @@ class PnaclResources {
const Manifest* manifest)
: plugin_(plugin),
coordinator_(coordinator),
manifest_(manifest),
llc_tool_name(kDefaultLlcName),
ld_tool_name(kDefaultLdName) {
manifest_(manifest) {
}
virtual ~PnaclResources();

Expand Down Expand Up @@ -99,13 +97,6 @@ class PnaclResources {
// once all_loaded_callback_ has been invoked.
std::map<nacl::string, nacl::DescWrapper*> resource_wrappers_;

// The names of the llc and ld nexes are read from the resource info file.
// These are default values if the resource file does not contain the names.
// TODO(eliben): this should be eventually removed, once all nacl deps
// propagate - the names should always exist in the resource info JSON file.
static const char kDefaultLlcName[];
static const char kDefaultLdName[];

// Tool names for llc and ld; read from the resource info file.
nacl::string llc_tool_name;
nacl::string ld_tool_name;
Expand Down

0 comments on commit 841ce9e

Please sign in to comment.