From 96a9a2baa31da9d11e3cdaf152241991ae832f35 Mon Sep 17 00:00:00 2001 From: jingwen Date: Tue, 23 Jan 2018 08:53:11 -0800 Subject: Pass the correct path of aapt_binary and merge its data runfiles into android_instrumentation_test's runfiles. GITHUB: #903 RELNOTES: None. PiperOrigin-RevId: 182940009 --- .../build/lib/rules/android/android_instrumentation_test_template.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/android_instrumentation_test_template.txt') 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 07dd76ce6b..b2863c1f35 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,7 +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" +aapt="${WORKSPACE_DIR}/%aapt%" device_script="${WORKSPACE_DIR}/%device_script%" data_deps="%data_deps%" -- cgit v1.2.3