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

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

Issue 21977003: Build changes for updating Android SDK to 4.3. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Roll android_tools in src/DEPS to new SDK. Created 7 years, 4 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 unified diff | Download patch
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 2
3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 # Defines functions for envsetup.sh which sets up environment for building 7 # Defines functions for envsetup.sh which sets up environment for building
8 # Chromium on Android. The build can be either use the Android NDK/SDK or 8 # Chromium on Android. The build can be either use the Android NDK/SDK or
9 # android source tree. Each has a unique init function which calls functions 9 # android source tree. Each has a unique init function which calls functions
10 # prefixed with "common_" that is common for both environment setups. 10 # prefixed with "common_" that is common for both environment setups.
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 # Set only if not already set. 55 # Set only if not already set.
56 # Don't override ANDROID_TOOLCHAIN if set by Android configuration env. 56 # Don't override ANDROID_TOOLCHAIN if set by Android configuration env.
57 export ANDROID_TOOLCHAIN=${ANDROID_TOOLCHAIN:-${toolchain_path}} 57 export ANDROID_TOOLCHAIN=${ANDROID_TOOLCHAIN:-${toolchain_path}}
58 58
59 common_check_toolchain 59 common_check_toolchain
60 60
61 # Add Android SDK/NDK tools to system path. 61 # Add Android SDK/NDK tools to system path.
62 export PATH=$PATH:${ANDROID_NDK_ROOT} 62 export PATH=$PATH:${ANDROID_NDK_ROOT}
63 export PATH=$PATH:${ANDROID_SDK_ROOT}/tools 63 export PATH=$PATH:${ANDROID_SDK_ROOT}/tools
64 export PATH=$PATH:${ANDROID_SDK_ROOT}/platform-tools 64 export PATH=$PATH:${ANDROID_SDK_ROOT}/platform-tools
65 export PATH=$PATH:${ANDROID_SDK_ROOT}/build-tools/\
66 ${ANDROID_SDK_BUILD_TOOLS_VERSION}
65 67
66 # This must be set before ANDROID_TOOLCHAIN, so that clang could find the 68 # This must be set before ANDROID_TOOLCHAIN, so that clang could find the
67 # gold linker. 69 # gold linker.
68 # TODO(michaelbai): Remove this path once the gold linker become the default 70 # TODO(michaelbai): Remove this path once the gold linker become the default
69 # linker. 71 # linker.
70 export PATH=$PATH:${CHROME_SRC}/build/android/${toolchain_arch}-gold 72 export PATH=$PATH:${CHROME_SRC}/build/android/${toolchain_arch}-gold
71 73
72 # Must have tools like arm-linux-androideabi-gcc on the path for ninja 74 # Must have tools like arm-linux-androideabi-gcc on the path for ninja
73 export PATH=$PATH:${ANDROID_TOOLCHAIN} 75 export PATH=$PATH:${ANDROID_TOOLCHAIN}
74 76
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 export GYP_DEFINES="${DEFINES}" 307 export GYP_DEFINES="${DEFINES}"
306 308
307 export GYP_GENERATORS="android" 309 export GYP_GENERATORS="android"
308 310
309 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All" 311 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All"
310 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1" 312 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1"
311 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} auto_regeneration=0" 313 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} auto_regeneration=0"
312 314
313 export CHROMIUM_GYP_FILE="${CHROME_SRC}/android_webview/all_webview.gyp" 315 export CHROMIUM_GYP_FILE="${CHROME_SRC}/android_webview/all_webview.gyp"
314 } 316 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698