diff options
| author | Evgeny Astigeevich <evgeny.astigeevich@linaro.org> | 2019-08-23 11:49:56 +0000 |
|---|---|---|
| committer | Linaro Android Code Review <android-review@review.linaro.org> | 2019-08-23 11:49:56 +0000 |
| commit | e847a32c7da6d40a012e100af2082ec831745401 (patch) | |
| tree | bcd43e0ca334518ef003615e9b0c4713f6143c33 | |
| parent | 500f5e801c1111fd2a31b435de3da02a653b8c9f (diff) | |
| parent | 720a7e80da037ec29df62abb9e723b589be2aa1d (diff) | |
| download | art-testing-e847a32c7da6d40a012e100af2082ec831745401.tar.gz | |
Merge "Add support of benchmark jar and resources files"
| -rwxr-xr-x | build.sh | 13 | ||||
| -rwxr-xr-x | tools/benchmarks/run.py | 7 |
2 files changed, 18 insertions, 2 deletions
@@ -130,7 +130,6 @@ set -f if [[ -z $JAVA_BENCHMARK_FILES ]]; then JAVA_BENCHMARK_FILES="$(find $DIR_BENCHMARKS -type f -name '*'.java)" - fi # Reenable wildcard expansion. @@ -176,7 +175,17 @@ else CROSS_COMPILE_FLAGS="-target $JAVA_VERSION -source $JAVA_VERSION" fi -verbose_safe javac -encoding UTF-8 $CROSS_COMPILE_FLAGS -cp $DIR_BENCHMARKS -cp $DIR_FRAMEWORK -d $DIR_BUILD/classes/ $JAVA_FRAMEWORK_FILES $JAVA_BENCHMARK_FILES +for jar_file in "${DIR_BENCHMARKS}"/lib/*.jar +do + # Extract jar file and remove META-INF, which is not needed and can cause + # issues with target runs. + (cd $DIR_BUILD/classes && jar xfv "${jar_file}" && rm -rf META-INF) +done + +if [[ -d "${DIR_BENCHMARKS}"/resources ]]; then + tar cfv $DIR_BUILD/resources.tar -C "${DIR_BENCHMARKS}" ./resources +fi +verbose_safe javac -encoding UTF-8 $CROSS_COMPILE_FLAGS -cp $DIR_BENCHMARKS:$DIR_BUILD/classes -d $DIR_BUILD/classes/ $JAVA_FRAMEWORK_FILES $JAVA_BENCHMARK_FILES verbose_safe jar cf $DIR_BUILD/bench.jar $DIR_BUILD/classes/ DX=$(which dx) if [ $TARGET_BUILD = "true" ] || [ -n "$DX" ]; then diff --git a/tools/benchmarks/run.py b/tools/benchmarks/run.py index 591bc60..2a90f3a 100755 --- a/tools/benchmarks/run.py +++ b/tools/benchmarks/run.py @@ -238,6 +238,13 @@ def GetBenchmarkResults(args): apk = os.path.join(utils.dir_build, 'bench.apk') apk_name = os.path.basename(apk) utils_adb.push(apk, args.target_copy_path, args.target) + resources_tar = os.path.join(utils.dir_build, 'resources.tar') + if os.path.isfile(resources_tar): + utils_adb.push(resources_tar, args.target_copy_path, args.target) + utils_adb.shell('tar xfv ' + + utils.TargetPathJoin(args.target_copy_path, 'resources.tar') + + ' -C ' + args.target_copy_path, + args.target) remote_apk = utils.TargetPathJoin(args.target_copy_path, apk_name) if args.norun: |