From 06e43f8b56ca50d7b87c7963d2251d1c72c00977 Mon Sep 17 00:00:00 2001 From: asteinb Date: Tue, 22 May 2018 08:38:40 -0700 Subject: Pass AndroidDataContext through manifest processing methods Manifest processing methods are particularly messy for this migration, since the old ApplicationManifest class is still around. Anyway, pass around AndroidDataContext instead of RuleContext everywhere we can. Note that the built-in expander does not seem able to be modified to support decoupling attributes and other information, and thus really can't be done once we get rid of RuleContext. Instead, for Skylark rules, document that expansion must happen outside of the Android data Skylark method calls (for example, for manifest_values and nocompress_extensions). RELNOTES: none PiperOrigin-RevId: 197567541 --- .../google/devtools/build/lib/rules/android/AndroidLibraryTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java') diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java index bc06435f46..6ba8585b01 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java @@ -1076,17 +1076,17 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { " srcs = ['foo.java'])"); ConfiguredTarget target = getConfiguredTarget("//java/android:l"); - Artifact manifest = getBinArtifact("l_generated/l/AndroidManifest.xml", target); + Artifact manifest = getBinArtifact("_generated/l/AndroidManifest.xml", target); FileWriteAction action = (FileWriteAction) getGeneratingAction(manifest); assertThat(action.getFileContents()).contains("package=\"android\""); target = getConfiguredTarget("//java/android:l2"); - manifest = getBinArtifact("l2_generated/l2/AndroidManifest.xml", target); + manifest = getBinArtifact("_generated/l2/AndroidManifest.xml", target); action = (FileWriteAction) getGeneratingAction(manifest); assertThat(action.getFileContents()).contains("package=\"foo\""); target = getConfiguredTarget("//third_party/android:l"); - manifest = getBinArtifact("l_generated/l/AndroidManifest.xml", target); + manifest = getBinArtifact("_generated/l/AndroidManifest.xml", target); action = (FileWriteAction) getGeneratingAction(manifest); assertThat(action.getFileContents()).contains("package=\"third_party.android\""); } -- cgit v1.2.3