diff options
| author |  asteinb <asteinb@google.com> | 2018-05-09 11:46:28 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-09 11:48:30 -0700 |
| commit | 7cddb57365f7d2c0c1ef8d184db3bbf40228c6c2 (patch) | |
| tree | 4237e3014139c56abca9186497082e5f998ba34a /src/test/java/com/google/devtools/build | |
| parent | c180c9292a45a000c197d7215a05da315aaf604b (diff) | |
Expose process_test_data (for android_test) to Skylark
Explicitly work with rele attributes at (or closer to) the top level rather
than deep in the code.
RELNOTES: none
PiperOrigin-RevId: 196004542
Diffstat (limited to 'src/test/java/com/google/devtools/build')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java index db71439629..a7bee2486c 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java @@ -17,6 +17,7 @@ import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.devtools.build.lib.actions.Artifact; @@ -448,7 +449,9 @@ public class AndroidResourcesTest extends ResourceTestBase { null); ValidatedAndroidData validated = - processedData.generateRClass(ruleContext).getValidatedResources(); + processedData + .generateRClass(ruleContext, AndroidAaptVersion.chooseTargetAaptVersion(ruleContext)) + .getValidatedResources(); // An action to generate the R.class file should be registered. assertActionArtifacts( @@ -462,8 +465,9 @@ public class AndroidResourcesTest extends ResourceTestBase { RuleContext ruleContext = getRuleContext("android_binary", "manifest='AndroidManifest.xml',"); ResourceApk resourceApk = - ProcessedAndroidData.processBinaryDataFrom(ruleContext, getManifest(), false) - .generateRClass(ruleContext); + ProcessedAndroidData.processBinaryDataFrom( + ruleContext, getManifest(), false, ImmutableMap.of(), AndroidAaptVersion.AUTO) + .generateRClass(ruleContext, AndroidAaptVersion.AUTO); assertThat(resourceApk.getResourceProguardConfig()).isNotNull(); assertThat(resourceApk.getMainDexProguardConfig()).isNotNull(); |