diff options
| author |  asteinb <asteinb@google.com> | 2018-05-22 07:51:42 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-22 07:53:08 -0700 |
| commit | 85a6f166cef1231f1e436978171870ce6b10a6d8 (patch) | |
| tree | a9f505849e02ee455ff3fe9ca2418a630dd3f72b /src/test/java/com/google/devtools | |
| parent | 8b6ddbbbe1c1a2f2b62979ffa4fdfed697258ac0 (diff) | |
Pass through AndroidDataContext in more places
As before, actual action builders will be changed in a future CL; this just
starts moving AndroidDataContext in so it's available.
RELNOTES: none
PiperOrigin-RevId: 197561737
Diffstat (limited to 'src/test/java/com/google/devtools')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java | 12 |
1 files changed, 9 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 b916c24b27..6b9ecb256f 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 @@ -459,7 +459,9 @@ public class AndroidResourcesTest extends ResourceTestBase { ValidatedAndroidData validated = processedData - .generateRClass(ruleContext, AndroidAaptVersion.chooseTargetAaptVersion(ruleContext)) + .generateRClass( + AndroidDataContext.forNative(ruleContext), + AndroidAaptVersion.chooseTargetAaptVersion(ruleContext)) .getValidatedResources(); // An action to generate the R.class file should be registered. @@ -472,9 +474,11 @@ public class AndroidResourcesTest extends ResourceTestBase { @Test public void testProcessBinaryDataGeneratesProguardOutput() throws Exception { RuleContext ruleContext = getRuleContext("android_binary", "manifest='AndroidManifest.xml',"); + AndroidDataContext dataContext = AndroidDataContext.forNative(ruleContext); ResourceApk resourceApk = ProcessedAndroidData.processBinaryDataFrom( + dataContext, ruleContext, getManifest(), false, @@ -487,8 +491,10 @@ public class AndroidResourcesTest extends ResourceTestBase { ResourceFilterFactory.empty(), ImmutableList.of(), false, - false) - .generateRClass(ruleContext, AndroidAaptVersion.AUTO); + false, + null, + null) + .generateRClass(dataContext, AndroidAaptVersion.AUTO); assertThat(resourceApk.getResourceProguardConfig()).isNotNull(); assertThat(resourceApk.getMainDexProguardConfig()).isNotNull(); |