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

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

Issue 93923002: Remove unused line from android/envsetup_functions.sh (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | « no previous file | no next file » | 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 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 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 '${ANDROID_BUILD_TOP}')") 303 '${ANDROID_BUILD_TOP}')")
304 ;; 304 ;;
305 "mac") 305 "mac")
306 ANDROID_SDK_TOOLS=$(python -c \ 306 ANDROID_SDK_TOOLS=$(python -c \
307 "import os.path; \ 307 "import os.path; \
308 print os.path.relpath('${ANDROID_SDK_ROOT}/../tools/darwin', \ 308 print os.path.relpath('${ANDROID_SDK_ROOT}/../tools/darwin', \
309 '${ANDROID_BUILD_TOP}')") 309 '${ANDROID_BUILD_TOP}')")
310 ;; 310 ;;
311 esac 311 esac
312 DEFINES+=" android_webview_build=1" 312 DEFINES+=" android_webview_build=1"
313 # temporary until all uses of android_build_type are gone (crbug.com/184431)
314 DEFINES+=" android_build_type=1"
315 DEFINES+=" android_src=\$(PWD)" 313 DEFINES+=" android_src=\$(PWD)"
316 DEFINES+=" android_sdk=\$(PWD)/${ANDROID_SDK}" 314 DEFINES+=" android_sdk=\$(PWD)/${ANDROID_SDK}"
317 DEFINES+=" android_sdk_root=\$(PWD)/${ANDROID_SDK}" 315 DEFINES+=" android_sdk_root=\$(PWD)/${ANDROID_SDK}"
318 DEFINES+=" android_sdk_tools=\$(PWD)/${ANDROID_SDK_TOOLS}" 316 DEFINES+=" android_sdk_tools=\$(PWD)/${ANDROID_SDK_TOOLS}"
319 DEFINES+=" android_sdk_version=${ANDROID_SDK_VERSION}" 317 DEFINES+=" android_sdk_version=${ANDROID_SDK_VERSION}"
320 DEFINES+=" android_toolchain=${ANDROID_TOOLCHAIN}" 318 DEFINES+=" android_toolchain=${ANDROID_TOOLCHAIN}"
321 if [[ -n "$CHROME_ANDROID_WEBVIEW_ENABLE_DMPROF" ]]; then 319 if [[ -n "$CHROME_ANDROID_WEBVIEW_ENABLE_DMPROF" ]]; then
322 DEFINES+=" disable_debugallocation=1" 320 DEFINES+=" disable_debugallocation=1"
323 DEFINES+=" android_full_debug=1" 321 DEFINES+=" android_full_debug=1"
324 DEFINES+=" android_use_tcmalloc=1" 322 DEFINES+=" android_use_tcmalloc=1"
325 fi 323 fi
326 export GYP_DEFINES="${DEFINES}" 324 export GYP_DEFINES="${DEFINES}"
327 325
328 export GYP_GENERATORS="android" 326 export GYP_GENERATORS="android"
329 327
330 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All" 328 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All"
331 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1" 329 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1"
332 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} auto_regeneration=0" 330 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} auto_regeneration=0"
333 331
334 export CHROMIUM_GYP_FILE="${CHROME_SRC}/android_webview/all_webview.gyp" 332 export CHROMIUM_GYP_FILE="${CHROME_SRC}/android_webview/all_webview.gyp"
335 } 333 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698