Index: build/config/android/internal_rules.gni |
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni |
index 3714b1f70b5df6f6f004919463f1168e9c50ea3f..ae139143d08b8e9c86601eb28d33aa74cd8e3510 100644 |
--- a/build/config/android/internal_rules.gni |
+++ b/build/config/android/internal_rules.gni |
@@ -316,7 +316,12 @@ template("write_build_config") { |
} |
} |
} |
- |
+ if (defined(invoker.enable_relocation_packing)) { |
+ args += [ |
+ "--enable-relocation-packing", |
+ invoker.enable_relocation_packing, |
+ ] |
+ } |
if (defined(invoker.java_sources_file)) { |
args += [ |
"--java-sources-file", |
@@ -556,6 +561,10 @@ template("test_runner_script") { |
_apk_under_test = "@FileArg($_rebased_apk_under_test_build_config:deps_info:incremental_apk_path)" |
} |
test_runner_args += [ "--apk-under-test=$_apk_under_test" ] |
+ test_runner_args += [ |
+ "--enable-relocation-packing", |
+ "@FileArg($_rebased_apk_under_test_build_config:deps_info:enable_relocation_packing)", |
+ ] |
} |
if (emma_coverage) { |
# Set a default coverage output directory (can be overridden by user |