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

Side by Side Diff: platform_tools/android/bin/android_make

Issue 254073003: Revert of Improve Android scripts: (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 7 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
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 2
3 # Fail-fast if anything in the script fails. 3 # Fail-fast if anything in the script fails.
4 set -e 4 set -e
5 5
6 # Remove any existing .android_config file before running android_setup. If we 6 # Remove any existing .android_config file before running android_setup. If we
7 # did not remove this now then we would build for whatever device type was 7 # did not remove this now then we would build for whatever device type was
8 # listed in the .android_config instead of the default device type. 8 # listed in the .android_config instead of the default device type.
9 rm -f .android_config 9 rm -f .android_config
10 10
11 SCRIPT_DIR=$(dirname "${BASH_SOURCE[0]}") 11 SCRIPT_DIR=$(dirname "${BASH_SOURCE[0]}")
12 source $SCRIPT_DIR/android_setup.sh 12 source $SCRIPT_DIR/android_setup.sh
13 13
14 SKIA_SRC_DIR=$(cd "${SCRIPT_DIR}/../../.."; pwd) 14 GYP_GENERATORS=ninja-android ./gyp_skia
15 GYP_GENERATORS=ninja-android "${SKIA_SRC_DIR}/gyp_skia"
16 ninja -C $SKIA_OUT/$BUILDTYPE ${APP_ARGS[@]} 15 ninja -C $SKIA_OUT/$BUILDTYPE ${APP_ARGS[@]}
17 16
18 # Write the device id into the .android_config file. This tells 17 # Write the device id into the .android_config file. This tells
19 # android_run_skia the last build we completed. 18 # android_run_skia the last build we completed.
20 echo $DEVICE_ID > .android_config 19 echo $DEVICE_ID > .android_config
21 20
OLDNEW
« no previous file with comments | « platform_tools/android/bin/android_gdbserver ('k') | platform_tools/android/bin/android_run_skia » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698