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

Side by Side Diff: android_webview/tools/gyp_webview

Issue 682603002: remove stray usage of logging_like_official_build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.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 | « 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 # This script runs gyp with the configuration required to build WebView in the 7 # This script runs gyp with the configuration required to build WebView in the
8 # Android build system. It is not necessary to source build/android/envsetup.sh 8 # Android build system. It is not necessary to source build/android/envsetup.sh
9 # before running this script. 9 # before running this script.
10 10
(...skipping 29 matching lines...) Expand all
40 '${ANDROID_BUILD_TOP}')") 40 '${ANDROID_BUILD_TOP}')")
41 DEFINES+=" android_src=\$(PWD)" 41 DEFINES+=" android_src=\$(PWD)"
42 DEFINES+=" android_ndk_root=ndk_root_unused_in_webview_build" 42 DEFINES+=" android_ndk_root=ndk_root_unused_in_webview_build"
43 DEFINES+=" android_sdk=\$(PWD)/${android_sdk}" 43 DEFINES+=" android_sdk=\$(PWD)/${android_sdk}"
44 DEFINES+=" android_sdk_root=\$(PWD)/${android_sdk}" 44 DEFINES+=" android_sdk_root=\$(PWD)/${android_sdk}"
45 DEFINES+=" android_sdk_version=sdk_version_unused_in_webview_build" 45 DEFINES+=" android_sdk_version=sdk_version_unused_in_webview_build"
46 DEFINES+=" android_toolchain=${ANDROID_TOOLCHAIN}" 46 DEFINES+=" android_toolchain=${ANDROID_TOOLCHAIN}"
47 47
48 # TODO: Get rid of this block, crbug.com/334021 48 # TODO: Get rid of this block, crbug.com/334021
49 if [[ -n "$CHROME_ANDROID_WEBVIEW_OFFICIAL_BUILD" ]]; then 49 if [[ -n "$CHROME_ANDROID_WEBVIEW_OFFICIAL_BUILD" ]]; then
50 DEFINES+=" logging_like_official_build=1"
51 DEFINES+=" tracing_like_official_build=1" 50 DEFINES+=" tracing_like_official_build=1"
52 fi 51 fi
53 52
54 export GYP_DEFINES="${GYP_DEFINES} ${DEFINES}" 53 export GYP_DEFINES="${GYP_DEFINES} ${DEFINES}"
55 54
56 FLAGS="-f android -Gdefault_target=libwebviewchromium -Glimit_to_target_all=1 "\ 55 FLAGS="-f android -Gdefault_target=libwebviewchromium -Glimit_to_target_all=1 "\
57 "-Gaosp_sdk_version=21 "\ 56 "-Gaosp_sdk_version=21 "\
58 "--depth=${CHROME_SRC} ${CHROME_SRC}/android_webview/android_webview.gyp" 57 "--depth=${CHROME_SRC} ${CHROME_SRC}/android_webview/android_webview.gyp"
59 58
60 for host_os in linux mac; do 59 for host_os in linux mac; do
(...skipping 15 matching lines...) Expand all
76 if [ "$PLATFORM" == "${host_platform}-x86" -o "$PLATFORM" == "all" ]; then 75 if [ "$PLATFORM" == "${host_platform}-x86" -o "$PLATFORM" == "all" ]; then
77 ${GYP} --suffix .${host_platform}-x86 ${EFLAGS} -Dtarget_arch=ia32 76 ${GYP} --suffix .${host_platform}-x86 ${EFLAGS} -Dtarget_arch=ia32
78 fi 77 fi
79 if [ "$PLATFORM" == "${host_platform}-x86_64" -o "$PLATFORM" == "all" ]; then 78 if [ "$PLATFORM" == "${host_platform}-x86_64" -o "$PLATFORM" == "all" ]; then
80 ${GYP} --suffix .${host_platform}-x86_64 ${EFLAGS} -Dtarget_arch=x64 79 ${GYP} --suffix .${host_platform}-x86_64 ${EFLAGS} -Dtarget_arch=x64
81 fi 80 fi
82 if [ "$PLATFORM" == "${host_platform}-mips" -o "$PLATFORM" == "all" ]; then 81 if [ "$PLATFORM" == "${host_platform}-mips" -o "$PLATFORM" == "all" ]; then
83 ${GYP} --suffix .${host_platform}-mips ${EFLAGS} -Dtarget_arch=mipsel 82 ${GYP} --suffix .${host_platform}-mips ${EFLAGS} -Dtarget_arch=mipsel
84 fi 83 fi
85 done 84 done
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