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

Side by Side Diff: build/android/envsetup.sh

Issue 754433003: Update from https://crrev.com/305340 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « build/android/buildbot/bb_run_bot.py ('k') | build/android/gyp/write_build_config.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 # Sets up environment for building Chromium on Android. 6 # Sets up environment for building Chromium on Android.
7 7
8 # Make sure we're being sourced (possibly by another script). Check for bash 8 # Make sure we're being sourced (possibly by another script). Check for bash
9 # since zsh sets $0 when sourcing. 9 # since zsh sets $0 when sourcing.
10 if [[ -n "$BASH_VERSION" && "${BASH_SOURCE:-$0}" == "$0" ]]; then 10 if [[ -n "$BASH_VERSION" && "${BASH_SOURCE:-$0}" == "$0" ]]; then
(...skipping 25 matching lines...) Expand all
36 # Allow the caller to override a few environment variables. If any of them is 36 # Allow the caller to override a few environment variables. If any of them is
37 # unset, we default to a sane value that's known to work. This allows for 37 # unset, we default to a sane value that's known to work. This allows for
38 # experimentation with a custom SDK. 38 # experimentation with a custom SDK.
39 if [[ -z "${ANDROID_SDK_ROOT}" || ! -d "${ANDROID_SDK_ROOT}" ]]; then 39 if [[ -z "${ANDROID_SDK_ROOT}" || ! -d "${ANDROID_SDK_ROOT}" ]]; then
40 local ANDROID_SDK_ROOT="${CHROME_SRC}/third_party/android_tools/sdk/" 40 local ANDROID_SDK_ROOT="${CHROME_SRC}/third_party/android_tools/sdk/"
41 fi 41 fi
42 42
43 # Add Android SDK tools to system path. 43 # Add Android SDK tools to system path.
44 export PATH=$PATH:${ANDROID_SDK_ROOT}/platform-tools 44 export PATH=$PATH:${ANDROID_SDK_ROOT}/platform-tools
45 45
46 # Add Android utility tools to the system path.
47 export PATH=$PATH:${ANDROID_SDK_ROOT}/tools/
48
46 # Add Chromium Android development scripts to system path. 49 # Add Chromium Android development scripts to system path.
47 # Must be after CHROME_SRC is set. 50 # Must be after CHROME_SRC is set.
48 export PATH=$PATH:${CHROME_SRC}/build/android 51 export PATH=$PATH:${CHROME_SRC}/build/android
49 52
50 export ENVSETUP_GYP_CHROME_SRC=${CHROME_SRC} # TODO(thakis): Remove. 53 export ENVSETUP_GYP_CHROME_SRC=${CHROME_SRC} # TODO(thakis): Remove.
51 } 54 }
52 # In zsh, $0 is the name of the file being sourced. 55 # In zsh, $0 is the name of the file being sourced.
53 android_envsetup_main "${BASH_SOURCE:-$0}" 56 android_envsetup_main "${BASH_SOURCE:-$0}"
54 unset -f android_envsetup_main 57 unset -f android_envsetup_main
55 58
56 android_gyp() { 59 android_gyp() {
57 echo "Please call build/gyp_chromium instead. android_gyp is going away." 60 echo "Please call build/gyp_chromium instead. android_gyp is going away."
58 "${ENVSETUP_GYP_CHROME_SRC}/build/gyp_chromium" --depth="${ENVSETUP_GYP_CHROME _SRC}" --check "$@" 61 "${ENVSETUP_GYP_CHROME_SRC}/build/gyp_chromium" --depth="${ENVSETUP_GYP_CHROME _SRC}" --check "$@"
59 } 62 }
OLDNEW
« no previous file with comments | « build/android/buildbot/bb_run_bot.py ('k') | build/android/gyp/write_build_config.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698