Pass AndroidDataContext through new asset and resource pipelines

This is the first step towards using AndroidDataContext in all of Android data
processing.

This change does not actually modify the asset and resource processing action
builders themselves - they will be migrated in an upcoming change.

Also, add AndroidSemantics to some rules so they can make an
AndroidDataContext.

RELNOTES: none
PiperOrigin-RevId: 197555938

1 files changed, 6 insertions, 5 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidAssetsTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidAssetsTest.java
index 9623fe1ff1..2da5c64606 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidAssetsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidAssetsTest.java
@@ -34,7 +34,7 @@ public class AndroidAssetsTest extends ResourceTestBase {
   public void testParse() throws Exception {
     RuleContext ruleContext = getRuleContext();
     AndroidAssets assets = getLocalAssets();
-    ParsedAndroidAssets parsed = assets.parse(ruleContext);
+    ParsedAndroidAssets parsed = assets.parse(AndroidDataContext.forNative(ruleContext));
 
     // Assets should be unchanged
     assertThat(parsed.getAssets()).isEqualTo(assets.getAssets());
@@ -53,7 +53,7 @@ public class AndroidAssetsTest extends ResourceTestBase {
   @Test
   public void testMergeNoDeps() throws Exception {
     RuleContext ruleContext = getRuleContext();
-    ParsedAndroidAssets parsed = getLocalAssets().parse(ruleContext);
+    ParsedAndroidAssets parsed = getLocalAssets().parse(AndroidDataContext.forNative(ruleContext));
     MergedAndroidAssets merged = assertMerge(ruleContext, parsed, AssetDependencies.empty());
 
     // The assets can be correctly built into a provider
@@ -70,7 +70,7 @@ public class AndroidAssetsTest extends ResourceTestBase {
   @Test
   public void testMergeNeverlink() throws Exception {
     RuleContext ruleContext = getRuleContext();
-    ParsedAndroidAssets parsed = getLocalAssets().parse(ruleContext);
+    ParsedAndroidAssets parsed = getLocalAssets().parse(AndroidDataContext.forNative(ruleContext));
     AssetDependencies deps = makeDeps(ruleContext, /* neverlink = */ true);
 
     MergedAndroidAssets merged = assertMerge(ruleContext, parsed, deps);
@@ -88,7 +88,7 @@ public class AndroidAssetsTest extends ResourceTestBase {
   @Test
   public void testMerge() throws Exception {
     RuleContext ruleContext = getRuleContext();
-    ParsedAndroidAssets parsed = getLocalAssets().parse(ruleContext);
+    ParsedAndroidAssets parsed = getLocalAssets().parse(AndroidDataContext.forNative(ruleContext));
     AssetDependencies deps = makeDeps(ruleContext, /* neverlink = */ false);
 
     MergedAndroidAssets merged = assertMerge(ruleContext, parsed, deps);
@@ -140,7 +140,8 @@ public class AndroidAssetsTest extends ResourceTestBase {
   private MergedAndroidAssets assertMerge(
       RuleContext ruleContext, ParsedAndroidAssets parsed, AssetDependencies deps)
       throws InterruptedException {
-    MergedAndroidAssets merged = MergedAndroidAssets.mergeFrom(ruleContext, parsed, deps);
+    MergedAndroidAssets merged =
+        MergedAndroidAssets.mergeFrom(AndroidDataContext.forNative(ruleContext), parsed, deps);
 
     // Inherited values should be unchanged
     assertThat(new ParsedAndroidAssets(merged)).isEqualTo(parsed);