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

Unified Diff: components/nacl/browser/nacl_browser.cc

Issue 831813004: Get nacl building again for android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comment out CheckEnvVar Created 5 years, 11 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 | « chrome/renderer/pepper/pepper_uma_host.cc ('k') | components/nacl/browser/nacl_browser_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/nacl/browser/nacl_browser.cc
diff --git a/components/nacl/browser/nacl_browser.cc b/components/nacl/browser/nacl_browser.cc
index 55b27de9c025cc1ad71c2cc8990f45f3b5f355bc..f53b3e0d2366bd59e0a19f6be4e2b950ad1e3242 100644
--- a/components/nacl/browser/nacl_browser.cc
+++ b/components/nacl/browser/nacl_browser.cc
@@ -66,6 +66,7 @@ const base::FilePath::StringType NaClIrtName() {
return irt_name;
}
+#if !defined(OS_ANDROID)
bool CheckEnvVar(const char* name, bool default_value) {
bool result = default_value;
const char* var = getenv(name);
@@ -74,6 +75,7 @@ bool CheckEnvVar(const char* name, bool default_value) {
}
return result;
}
+#endif
void ReadCache(const base::FilePath& filename, std::string* data) {
if (!base::ReadFileToString(filename, data)) {
@@ -140,14 +142,17 @@ NaClBrowser::NaClBrowser()
: irt_filepath_(),
irt_state_(NaClResourceUninitialized),
validation_cache_file_path_(),
- validation_cache_is_enabled_(
- CheckEnvVar("NACL_VALIDATION_CACHE",
- kValidationCacheEnabledByDefault)),
+ validation_cache_is_enabled_(false),
validation_cache_is_modified_(false),
validation_cache_state_(NaClResourceUninitialized),
path_cache_(kFilePathCacheSize),
ok_(true),
weak_factory_(this) {
+#if !defined(OS_ANDROID)
+ validation_cache_is_enabled_ =
+ CheckEnvVar("NACL_VALIDATION_CACHE",
+ kValidationCacheEnabledByDefault);
+#endif
}
void NaClBrowser::SetDelegate(NaClBrowserDelegate* delegate) {
« no previous file with comments | « chrome/renderer/pepper/pepper_uma_host.cc ('k') | components/nacl/browser/nacl_browser_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698