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

Side by Side Diff: android_webview/tools/gyp_webview

Issue 692503002: Remove obsolete "android_src" gyp/gn variable. (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 | build/config/android/config.gni » ('j') | 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 20 matching lines...) Expand all
31 31
32 DEFINES="OS=android" 32 DEFINES="OS=android"
33 DEFINES+=" android_webview_build=1" 33 DEFINES+=" android_webview_build=1"
34 34
35 # We need to supply SDK paths relative to the top of the Android tree to make 35 # We need to supply SDK paths relative to the top of the Android tree to make
36 # sure the generated Android makefiles are portable, as they will be checked 36 # sure the generated Android makefiles are portable, as they will be checked
37 # into the Android tree. 37 # into the Android tree.
38 android_sdk=$(python -c \ 38 android_sdk=$(python -c \
39 "import os.path; print os.path.relpath('${ANDROID_SDK_ROOT}', \ 39 "import os.path; print os.path.relpath('${ANDROID_SDK_ROOT}', \
40 '${ANDROID_BUILD_TOP}')") 40 '${ANDROID_BUILD_TOP}')")
41 DEFINES+=" android_src=\$(PWD)"
42 DEFINES+=" android_ndk_root=ndk_root_unused_in_webview_build" 41 DEFINES+=" android_ndk_root=ndk_root_unused_in_webview_build"
43 DEFINES+=" android_sdk=\$(PWD)/${android_sdk}" 42 DEFINES+=" android_sdk=\$(PWD)/${android_sdk}"
44 DEFINES+=" android_sdk_root=\$(PWD)/${android_sdk}" 43 DEFINES+=" android_sdk_root=\$(PWD)/${android_sdk}"
45 DEFINES+=" android_sdk_version=sdk_version_unused_in_webview_build" 44 DEFINES+=" android_sdk_version=sdk_version_unused_in_webview_build"
46 DEFINES+=" android_toolchain=${ANDROID_TOOLCHAIN}" 45 DEFINES+=" android_toolchain=${ANDROID_TOOLCHAIN}"
47 46
48 # TODO: Get rid of this block, crbug.com/334021 47 # TODO: Get rid of this block, crbug.com/334021
49 if [[ -n "$CHROME_ANDROID_WEBVIEW_OFFICIAL_BUILD" ]]; then 48 if [[ -n "$CHROME_ANDROID_WEBVIEW_OFFICIAL_BUILD" ]]; then
50 DEFINES+=" tracing_like_official_build=1" 49 DEFINES+=" tracing_like_official_build=1"
51 fi 50 fi
(...skipping 23 matching lines...) Expand all
75 if [ "$PLATFORM" == "${host_platform}-x86" -o "$PLATFORM" == "all" ]; then 74 if [ "$PLATFORM" == "${host_platform}-x86" -o "$PLATFORM" == "all" ]; then
76 ${GYP} --suffix .${host_platform}-x86 ${EFLAGS} -Dtarget_arch=ia32 75 ${GYP} --suffix .${host_platform}-x86 ${EFLAGS} -Dtarget_arch=ia32
77 fi 76 fi
78 if [ "$PLATFORM" == "${host_platform}-x86_64" -o "$PLATFORM" == "all" ]; then 77 if [ "$PLATFORM" == "${host_platform}-x86_64" -o "$PLATFORM" == "all" ]; then
79 ${GYP} --suffix .${host_platform}-x86_64 ${EFLAGS} -Dtarget_arch=x64 78 ${GYP} --suffix .${host_platform}-x86_64 ${EFLAGS} -Dtarget_arch=x64
80 fi 79 fi
81 if [ "$PLATFORM" == "${host_platform}-mips" -o "$PLATFORM" == "all" ]; then 80 if [ "$PLATFORM" == "${host_platform}-mips" -o "$PLATFORM" == "all" ]; then
82 ${GYP} --suffix .${host_platform}-mips ${EFLAGS} -Dtarget_arch=mipsel 81 ${GYP} --suffix .${host_platform}-mips ${EFLAGS} -Dtarget_arch=mipsel
83 fi 82 fi
84 done 83 done
OLDNEW
« no previous file with comments | « no previous file | build/config/android/config.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698