summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorjbudorick <jbudorick@chromium.org>2016-03-24 20:07:49 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-25 03:09:41 +0000
commite18e7a6d2e1971e9b50b0ca3fe1fc9f17b264193 (patch)
treeea5e8e4d19c8b4b7a9d59a5aa4cac02650443d36 /build
parent5cc29a417bcb7b86ca8ebc4304eefa4d74a7e919 (diff)
downloadchromium_src-e18e7a6d2e1971e9b50b0ca3fe1fc9f17b264193.zip
chromium_src-e18e7a6d2e1971e9b50b0ca3fe1fc9f17b264193.tar.gz
chromium_src-e18e7a6d2e1971e9b50b0ca3fe1fc9f17b264193.tar.bz2
[cronet] Add an isolate file for cronet_test_instrumentation_apk.
These files are used by QuicTestServer & PkpTest. They're currently handled as a special case in //build/android/pylib/instrumentation/setup.py that I'd like to get rid of. BUG= Review URL: https://codereview.chromium.org/1826313003 Cr-Commit-Position: refs/heads/master@{#383232}
Diffstat (limited to 'build')
-rw-r--r--build/config/android/rules.gni12
1 files changed, 10 insertions, 2 deletions
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index b3f81a7..b974baf 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1923,12 +1923,20 @@ template("android_apk") {
}
group(target_name) {
- forward_variables_from(invoker, [ "data_deps" ])
+ forward_variables_from(invoker,
+ [
+ "data",
+ "data_deps",
+ ])
public_deps = _final_deps
}
group("${target_name}_incremental") {
data_deps = []
- forward_variables_from(invoker, [ "data_deps" ])
+ forward_variables_from(invoker,
+ [
+ "data",
+ "data_deps",
+ ])
# device/commands is used by the installer script to push files via .zip.
data_deps += [ "//build/android/pylib/device/commands" ] +