Commit 872d4a4a authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Make //third_party/jdk a data_dep of performance_test_suite

Java is required to run "bundletool", which our test runners currently
use to deploy Android App Bundles.

TBR=jbudorick

Bug: 1018706
Change-Id: I5dd75bbe35431e1fd8dd1de32ad4e7ed66ce3d61
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1884760Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarPeter Wen <wnwen@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#710081}
parent e815ab45
...@@ -1112,7 +1112,7 @@ deps = { ...@@ -1112,7 +1112,7 @@ deps = {
'packages': [ 'packages': [
{ {
'package': 'chromium/third_party/jdk', 'package': 'chromium/third_party/jdk',
'version': 'rfJtuH296mzs7BYOgmQkpz-7ydXtpLKeO15qDDMaa5cC', 'version': 'PfRSnxe8Od6WU4zBXomq-zsgcJgWmm3z4gMQNB-r2QcC',
}, },
], ],
'condition': 'host_os == "linux" and checkout_android', 'condition': 'host_os == "linux" and checkout_android',
......
...@@ -38,4 +38,9 @@ group("run_perf_test") { ...@@ -38,4 +38,9 @@ group("run_perf_test") {
data_deps = [ data_deps = [
":test_scripts_shared", ":test_scripts_shared",
] ]
if (is_android) {
# Required when running with bundles (to run "bundletool").
data_deps += [ "//third_party/jdk:java_data" ]
}
} }
# Copyright 2019 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
group("java_data") {
data = [
"current/bin/java",
"current/conf",
"current/jmods",
"current/lib",
]
}
...@@ -7,5 +7,8 @@ ...@@ -7,5 +7,8 @@
package: chromium/third_party/jdk package: chromium/third_party/jdk
description: Java Development Kit description: Java Development Kit
root: ./ root: ./
# TODO(https://crbug.com/977242): Remove this and go back to symlinks once
# swarming isolation works properly with symlinks.
install_mode: copy
data: data:
- dir: current - dir: current
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment