Get nacl building again for android

components/nacl/browser/nacl_browser.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/nacl/browser/nacl_browser.h"
 
 #include "base/command_line.h"
 #include "base/files/file_proxy.h"
 #include "base/files/file_util.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 48 matching lines @@
   irt_name.append(FILE_PATH_LITERAL("arm"));
 #elif defined(ARCH_CPU_MIPSEL)
   irt_name.append(FILE_PATH_LITERAL("mips32"));
 #else
 #error Add support for your architecture to NaCl IRT file selection
 #endif
   irt_name.append(FILE_PATH_LITERAL(".nexe"));
   return irt_name;
 }
 
+#if !defined(OS_ANDROID)
 bool CheckEnvVar(const char* name, bool default_value) {
   bool result = default_value;
   const char* var = getenv(name);
   if (var && strlen(var) > 0) {
     result = var[0] != '0';
   }
   return result;
 }
+#endif
 
 void ReadCache(const base::FilePath& filename, std::string* data) {
   if (!base::ReadFileToString(filename, data)) {
     // Zero-size data used as an in-band error code.
     data->clear();
   }
 }
 
 void WriteCache(const base::FilePath& filename, const Pickle* pickle) {
   base::WriteFile(filename, static_cast<const char*>(pickle->data()),
@@ skipping 46 matching lines @@
   if (!file.GetInfo(&file_info) || file_info.is_directory)
     return base::File();
 
   return file.Pass();
 }
 
 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) {
   NaClBrowser* nacl_browser = NaClBrowser::GetInstance();
   nacl_browser->browser_delegate_.reset(delegate);
 }
 
 NaClBrowserDelegate* NaClBrowser::GetDelegate() {
   // The delegate is not owned by the IO thread.  This accessor method can be
   // called from other threads.
@@ skipping 394 matching lines @@
 bool NaClBrowser::IsThrottled() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   if (crash_times_.size() != kMaxCrashesPerInterval) {
     return false;
   }
   base::TimeDelta delta = base::Time::Now() - crash_times_.front();
   return delta.InSeconds() <= kCrashesIntervalInSeconds;
 }
 
 }  // namespace nacl