diff options
| author |  asteinb <asteinb@google.com> | 2018-05-10 11:19:51 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-10 11:21:47 -0700 |
| commit | b5cd7065aeb0370fb6c341bc2578315ca1c62297 (patch) | |
| tree | ee969586e61f7f23cd7a836b65e185722b13efc3 /src/test | |
| parent | f9e7529908149e0511cc666c8fed879a50dbaea8 (diff) | |
Expose android_binary data processing methods to Skylark
Create an AndroidBinaryDataInfo to wrap binary-specific artifacts that
shouldn't be exposed for libraries. This is currently only the final resource
APK.
Continue to extract attribute references from lower-level methods and bubble
them up to the top level.
RELNOTES: none
PiperOrigin-RevId: 196143940
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java | 14 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/ResourceFilterFactoryTest.java | 6 |
2 files changed, 17 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 a7bee2486c..ef238c1c56 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 @@ -466,7 +466,19 @@ public class AndroidResourcesTest extends ResourceTestBase { ResourceApk resourceApk = ProcessedAndroidData.processBinaryDataFrom( - ruleContext, getManifest(), false, ImmutableMap.of(), AndroidAaptVersion.AUTO) + ruleContext, + getManifest(), + false, + ImmutableMap.of(), + AndroidAaptVersion.AUTO, + AndroidResources.empty(), + AndroidAssets.empty(), + ResourceDependencies.empty(), + AssetDependencies.empty(), + ResourceFilterFactory.empty(), + ImmutableList.of(), + false, + false) .generateRClass(ruleContext, AndroidAaptVersion.AUTO); assertThat(resourceApk.getResourceProguardConfig()).isNotNull(); diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/ResourceFilterFactoryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/ResourceFilterFactoryTest.java index 6b47a0adde..1793e42b14 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/ResourceFilterFactoryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/ResourceFilterFactoryTest.java @@ -25,6 +25,7 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; import com.google.devtools.build.lib.packages.AttributeMap; import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException; +import com.google.devtools.build.lib.rules.android.AndroidConfiguration.AndroidAaptVersion; import com.google.devtools.build.lib.testutil.FakeAttributeMapper; import java.util.ArrayList; import java.util.List; @@ -477,8 +478,9 @@ public class ResourceFilterFactoryTest extends ResourceTestBase { ImmutableList<String> densities, boolean filterInAnalysis) { - return ResourceFilterFactory.from( - filterInAnalysis, getAttributeMap(resourceConfigurationFilters, densities)); + return ResourceFilterFactory.fromAttrs( + filterInAnalysis ? AndroidAaptVersion.AAPT : AndroidAaptVersion.AAPT2, + getAttributeMap(resourceConfigurationFilters, densities)); } private AttributeMap getAttributeMap( |