Commit 6585ea38 authored by Nico Weber's avatar Nico Weber Committed by Commit Bot

android: envsetup.sh: Remove ability to set custom CHROME_SRC.

This is a remnant from long ago; I don't think anyone still uses this.
(If you do use this, please let me know, and feel free to revert this CL.)

Bug: 330631
Change-Id: I7870f0c9f3321931de1c1c3eff101f07762c8772
Reviewed-on: https://chromium-review.googlesource.com/579957Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#488306}
parent 94bff093
...@@ -16,33 +16,14 @@ fi ...@@ -16,33 +16,14 @@ fi
android_envsetup_main() { android_envsetup_main() {
local SCRIPT_PATH="$1" local SCRIPT_PATH="$1"
local SCRIPT_DIR="$(dirname "$SCRIPT_PATH")" local SCRIPT_DIR="$(dirname "$SCRIPT_PATH")"
local CHROME_SRC="$(readlink -f "${SCRIPT_DIR}/../../")"
local CURRENT_DIR="$(readlink -f "${SCRIPT_DIR}/../../")"
if [[ -z "${CHROME_SRC}" ]]; then
# If $CHROME_SRC was not set, assume current directory is CHROME_SRC.
local CHROME_SRC="${CURRENT_DIR}"
fi
if [[ "${CURRENT_DIR/"${CHROME_SRC}"/}" == "${CURRENT_DIR}" ]]; then
# If current directory is not in $CHROME_SRC, it might be set for other
# source tree. If $CHROME_SRC was set correctly and we are in the correct
# directory, "${CURRENT_DIR/"${CHROME_SRC}"/}" will be "".
# Otherwise, it will equal to "${CURRENT_DIR}"
echo "Warning: Current directory is out of CHROME_SRC, it may not be \
the one you want."
echo "${CHROME_SRC}"
fi
local ANDROID_SDK_ROOT="${CHROME_SRC}/third_party/android_tools/sdk/" local ANDROID_SDK_ROOT="${CHROME_SRC}/third_party/android_tools/sdk/"
# Add Android SDK tools to system path. # Add Android SDK and utility tools to the system path.
export PATH=$PATH:${ANDROID_SDK_ROOT}/platform-tools export PATH=$PATH:${ANDROID_SDK_ROOT}/platform-tools
# Add Android utility tools to the system path.
export PATH=$PATH:${ANDROID_SDK_ROOT}/tools/ export PATH=$PATH:${ANDROID_SDK_ROOT}/tools/
# Add Chromium Android development scripts to system path. # Add Chromium Android development scripts to the system path.
# Must be after CHROME_SRC is set.
export PATH=$PATH:${CHROME_SRC}/build/android export PATH=$PATH:${CHROME_SRC}/build/android
} }
# In zsh, $0 is the name of the file being sourced. # In zsh, $0 is the name of the file being sourced.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment