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

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

Issue 11783108: Revert 176176 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « build/android/ant/create-test-jar.js ('k') | build/android/process_resources.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Deleted: svn:executable
- *
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # Sets up environment for building Chromium on Android. It can either be 5 # Sets up environment for building Chromium on Android. It can either be
6 # compiled with the Android tree or using the Android SDK/NDK. To build with 6 # compiled with the Android tree or using the Android SDK/NDK. To build with
7 # NDK/SDK: ". build/android/envsetup.sh". Environment variable 7 # NDK/SDK: ". build/android/envsetup.sh". Environment variable
8 # ANDROID_SDK_BUILD=1 will then be defined and used in the rest of the setup to 8 # ANDROID_SDK_BUILD=1 will then be defined and used in the rest of the setup to
9 # specifiy build type. 9 # specifiy build type.
10 10
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 # If current directory is not in $CHROME_SRC, it might be set for other 74 # If current directory is not in $CHROME_SRC, it might be set for other
75 # source tree. If $CHROME_SRC was set correctly and we are in the correct 75 # source tree. If $CHROME_SRC was set correctly and we are in the correct
76 # directory, "${CURRENT_DIR/"${CHROME_SRC}"/}" will be "". 76 # directory, "${CURRENT_DIR/"${CHROME_SRC}"/}" will be "".
77 # Otherwise, it will equal to "${CURRENT_DIR}" 77 # Otherwise, it will equal to "${CURRENT_DIR}"
78 echo "Warning: Current directory is out of CHROME_SRC, it may not be \ 78 echo "Warning: Current directory is out of CHROME_SRC, it may not be \
79 the one you want." 79 the one you want."
80 echo "${CHROME_SRC}" 80 echo "${CHROME_SRC}"
81 fi 81 fi
82 82
83 # Android sdk platform version to use 83 # Android sdk platform version to use
84 export ANDROID_SDK_VERSION=17 84 export ANDROID_SDK_VERSION=16
85 85
86 if [[ "${ANDROID_SDK_BUILD}" -eq 1 ]]; then 86 if [[ "${ANDROID_SDK_BUILD}" -eq 1 ]]; then
87 if [[ -z "${TARGET_ARCH}" ]]; then 87 if [[ -z "${TARGET_ARCH}" ]]; then
88 return 1 88 return 1
89 fi 89 fi
90 sdk_build_init 90 sdk_build_init
91 # Sets up environment for building Chromium for Android with source. Expects 91 # Sets up environment for building Chromium for Android with source. Expects
92 # android environment setup and lunch. 92 # android environment setup and lunch.
93 elif [[ -z "$ANDROID_BUILD_TOP" || \ 93 elif [[ -z "$ANDROID_BUILD_TOP" || \
94 -z "$ANDROID_TOOLCHAIN" || \ 94 -z "$ANDROID_TOOLCHAIN" || \
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 # This is just a simple wrapper of gyp_chromium, please don't add anything 129 # This is just a simple wrapper of gyp_chromium, please don't add anything
130 # in this function. 130 # in this function.
131 echo "GYP_GENERATORS set to '$GYP_GENERATORS'" 131 echo "GYP_GENERATORS set to '$GYP_GENERATORS'"
132 ( 132 (
133 "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}" --check "$@" 133 "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}" --check "$@"
134 ) 134 )
135 } 135 }
136 136
137 # FLOCK needs to be null on system that has no flock 137 # FLOCK needs to be null on system that has no flock
138 which flock > /dev/null || export FLOCK= 138 which flock > /dev/null || export FLOCK=
OLDNEW
« no previous file with comments | « build/android/ant/create-test-jar.js ('k') | build/android/process_resources.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698