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

Side by Side Diff: platform_tools/android/bin/android_setup.sh

Issue 1694813004: Remove check for platform_tools/android/third_party/externals. (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: Created 4 years, 10 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
« 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 2015 Google Inc. 3 # Copyright 2015 Google Inc.
4 # 4 #
5 # Use of this source code is governed by a BSD-style license that can be 5 # Use of this source code is governed by a BSD-style license that can be
6 # found in the LICENSE file. 6 # found in the LICENSE file.
7 ############################################################################### 7 ###############################################################################
8 # 8 #
9 # android_setup.sh: Sets environment variables used by other Android scripts. 9 # android_setup.sh: Sets environment variables used by other Android scripts.
10 10
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 echo "No ANDROID_SDK_ROOT set and can't auto detect it from location of and roid binary." 68 echo "No ANDROID_SDK_ROOT set and can't auto detect it from location of and roid binary."
69 exit 1 69 exit 1
70 fi 70 fi
71 fi 71 fi
72 72
73 if [ -z "$ANDROID_HOME" ]; then 73 if [ -z "$ANDROID_HOME" ]; then
74 echo "ANDROID_HOME not set so we are setting it to a default value of ANDROID_ SDK_ROOT" 74 echo "ANDROID_HOME not set so we are setting it to a default value of ANDROID_ SDK_ROOT"
75 exportVar ANDROID_HOME $ANDROID_SDK_ROOT 75 exportVar ANDROID_HOME $ANDROID_SDK_ROOT
76 fi 76 fi
77 77
78 # check to see that gclient sync ran successfully
79 THIRD_PARTY_EXTERNAL_DIR=${SCRIPT_DIR}/../third_party/externals
80 if [ ! -d "$THIRD_PARTY_EXTERNAL_DIR" ]; then
81 echo ""
82 echo "ERROR: Unable to find the required third_party dependencies needed to build."
83 echo " To fix this add the following line to your .gclient file an d run 'gclient sync'"
84 echo " target_os = ['android']"
85 echo ""
86 exit 1;
87 fi
88
89 # Helper function to configure the GYP defines to the appropriate values 78 # Helper function to configure the GYP defines to the appropriate values
90 # based on the target device. 79 # based on the target device.
91 setup_device() { 80 setup_device() {
92 DEFINES="OS=android" 81 DEFINES="OS=android"
93 DEFINES="${DEFINES} host_os=$(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/' )" 82 DEFINES="${DEFINES} host_os=$(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/' )"
94 DEFINES="${DEFINES} skia_os=android" 83 DEFINES="${DEFINES} skia_os=android"
95 DEFINES="${DEFINES} android_base=$(absPath ${SCRIPT_DIR}/..)" 84 DEFINES="${DEFINES} android_base=$(absPath ${SCRIPT_DIR}/..)"
96 if [[ "$GYP_DEFINES" != *skia_shared_lib=* ]]; then 85 if [[ "$GYP_DEFINES" != *skia_shared_lib=* ]]; then
97 DEFINES="${DEFINES} skia_shared_lib=1" 86 DEFINES="${DEFINES} skia_shared_lib=1"
98 fi 87 fi
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 adb_push_if_needed $HOST_SRC $ANDROID_DST 252 adb_push_if_needed $HOST_SRC $ANDROID_DST
264 else 253 else
265 echo -n "$ANDROID_DST " 254 echo -n "$ANDROID_DST "
266 $ADB $DEVICE_SERIAL shell mkdir -p "$(dirname "$ANDROID_DST")" 255 $ADB $DEVICE_SERIAL shell mkdir -p "$(dirname "$ANDROID_DST")"
267 $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST 256 $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST
268 fi 257 fi
269 fi 258 fi
270 } 259 }
271 260
272 setup_device "${DEVICE_ID}" 261 setup_device "${DEVICE_ID}"
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