diff options
2 files changed, 8 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTest.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTest.java index cc3d44e9fc..33dee6c938 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTest.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTest.java @@ -85,6 +85,7 @@ public class AndroidInstrumentationTest implements RuleConfiguredTargetFactory { .addTargets(runfilesDeps, RunfilesProvider.DEFAULT_RUNFILES) .addTransitiveArtifacts(AndroidCommon.getSupportApks(ruleContext)) .addTransitiveArtifacts(getAdb(ruleContext).getFilesToRun()) + .addTransitiveArtifacts(getAapt(ruleContext).getFilesToRun()) .addArtifacts(getDataDeps(ruleContext)) .build(); @@ -251,6 +252,11 @@ public class AndroidInstrumentationTest implements RuleConfiguredTargetFactory { return AndroidSdkProvider.fromRuleContext(ruleContext).getAdb(); } + /** AAPT binary from the Android SDK. */ + private static FilesToRunProvider getAapt(RuleContext ruleContext) { + return AndroidSdkProvider.fromRuleContext(ruleContext).getAapt(); + } + /** Map of {@code test_args} for the test runner to make available to test test code. */ private static ImmutableMap<String, String> getTestArgs(RuleContext ruleContext) { return ImmutableMap.copyOf(ruleContext.attributes().get("test_args", Type.STRING_DICT)); diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/android_instrumentation_test_template.txt b/src/main/java/com/google/devtools/build/lib/rules/android/android_instrumentation_test_template.txt index fb92b97e2c..07dd76ce6b 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/android_instrumentation_test_template.txt +++ b/src/main/java/com/google/devtools/build/lib/rules/android/android_instrumentation_test_template.txt @@ -44,6 +44,7 @@ test_entry_point="%test_entry_point%" log_levels="%log_levels%" WORKSPACE_DIR="${TEST_SRCDIR}/%workspace%" adb="${WORKSPACE_DIR}/%adb%" +aapt="${WORKSPACE_DIR}/../../external/androidsdk/aapt_binary" device_script="${WORKSPACE_DIR}/%device_script%" data_deps="%data_deps%" @@ -71,6 +72,7 @@ fixture_args="%fixture_args%" test_suite_property_name='%test_suite_property_name%' argv=$(cat <<END +--aapt="${aapt}" \ --adb="${adb}" \ --device_broker_type="${device_broker_type}" \ --device_script="${device_script}" \ |