Revert 242405 "Skip downloading of nacl toolchain for android. "

trunk/src/build/android/envsetup_functions.sh

 #!/bin/bash
 
 # Copyright (c) 2012 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.
 
 # Defines functions for envsetup.sh which sets up environment for building
 # Chromium on Android.  The build can be either use the Android NDK/SDK or
 # android source tree.  Each has a unique init function which calls functions
 # prefixed with "common_" that is common for both environment setups.
@@ skipping 114 matching lines @@
       ;;
     "mips")
       DEFINES+=" target_arch=mipsel"
       DEFINES+=" mips_arch_variant=mips32r1"
       ;;
     *)
       echo "TARGET_ARCH: ${TARGET_ARCH} is not supported." >& 2
       print_usage
       return 1
   esac
-
-  # nacl isn't enabled for android, avoid downloading the toolchain.
-  DEFINES+=" -Ddisable_nacl=1"
 }
 
 
 ################################################################################
 # Exports common GYP variables based on variable DEFINES and CHROME_SRC.
 ################################################################################
 common_gyp_vars() {
   export GYP_DEFINES="${DEFINES}"
 
   # Set GYP_GENERATORS to ninja if it's currently unset or null.
@@ skipping 179 matching lines @@
   export GYP_DEFINES="${DEFINES}"
 
   export GYP_GENERATORS="android"
 
   export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All"
   export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1"
   export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} auto_regeneration=0"
 
   export CHROMIUM_GYP_FILE="${CHROME_SRC}/android_webview/all_webview.gyp"
 }