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

Unified Diff: build/config/android/rules.gni

Issue 2233613002: [Android] Remove vestigial isolate_file logic from instrumentation_test_apk. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unused gypi_to_gn invocation. Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 9894b5a72cd740701138278a9fd0fc9c5a7008d2..ba0c2100e1adfe244e79068fe9865581d228d965 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -2239,7 +2239,6 @@ if (enable_java_templates) {
# libraries depend on other shared_library targets, those dependencies will
# also be included in the apk (e.g. for is_component_build).
# apk_under_test: The apk being tested.
- # isolate_file: Isolate file containing the list of test data dependencies.
#
# Example
# instrumentation_test_apk("foo_test_apk") {
@@ -2274,10 +2273,6 @@ if (enable_java_templates) {
output = _device_isolate_path
}
- if (defined(invoker.isolate_file)) {
- assert(invoker.isolate_file != "")
- }
-
test_runner_script(_test_runner_target_name) {
forward_variables_from(invoker,
[
@@ -2352,17 +2347,6 @@ if (enable_java_templates) {
if (defined(invoker.apk_under_test)) {
public_deps += [ invoker.apk_under_test ]
}
- if (defined(invoker.isolate_file)) {
- isolate_values = exec_script("//build/gypi_to_gn.py",
- [
- rebase_path(invoker.isolate_file),
- "--replace",
- "<(DEPTH)=/",
- ],
- "scope",
- [ invoker.isolate_file ])
- data = isolate_values.files
- }
}
# TODO: Delete once recipes no longer use this target.
« 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