aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google/devtools/build/lib/rules/android
diff options
context:
space:
mode:
authorGravatar asteinb <asteinb@google.com>2018-04-11 14:26:07 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-04-11 14:27:21 -0700
commite8243465731f5c407448e7b9d5686663f149b9da (patch)
treeeca2f1d9bfa338b42c9a051522c35976477f5be3 /src/test/java/com/google/devtools/build/lib/rules/android
parent0fcad77c50290a66bdf3870eda7ec7656549c2eb (diff)
Add skipped manifest processing methods
Add some required manifest support I didn't previously implement: - Support for exports_manifest field - Get properly processed manifest from AndroidSemantics - Correctly represent the current relationship between manifest and resource processing - resource processing uses the stamped manifest. RELNOTES: none PiperOrigin-RevId: 192508962
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/android')
-rw-r--r--src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java5
1 files changed, 3 insertions, 2 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 cf25120a8e..85d7e254b7 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
@@ -243,7 +243,7 @@ public class AndroidResourcesTest extends ResourceTestBase {
ruleContext,
/* inputs = */ ImmutableList.<Artifact>builder()
.addAll(parsed.getResources())
- .add(getManifest())
+ .add(parsed.getManifest())
.build(),
/* outputs = */ ImmutableList.of(
parsed.getCompiledSymbols(), DataBinding.getSuffixedInfoFile(ruleContext, "_unused")));
@@ -291,7 +291,8 @@ public class AndroidResourcesTest extends ResourceTestBase {
new AndroidResources(
resources, AndroidResources.getResourceRoots(ruleContext, resources, "resource_files"));
StampedAndroidManifest manifest =
- new StampedAndroidManifest(getManifest(), "some.java.pkg");
+ new AndroidManifest(getManifest(), "some.java.pkg", /* exported = */ true)
+ .stamp(ruleContext);
ParsedAndroidResources parsed = raw.parse(ruleContext, manifest);