diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java b/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java index 94e99ac53d..b0b08102d9 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java @@ -420,7 +420,10 @@ public final class ApplicationManifest { .setSourceJarOut(resourceContainer.getJavaSourceJar()); } ResourceContainer processed = - builder.build(dataContext, resourceContainer, DataBinding.contextFrom(ruleContext)); + builder.build( + dataContext, + resourceContainer, + DataBinding.contextFrom(ruleContext, dataContext.getAndroidConfig())); ResourceContainer finalContainer = new RClassGeneratorActionBuilder() @@ -496,7 +499,10 @@ public final class ApplicationManifest { .setStaticLibraryOut(merged.getStaticLibrary()) .build(dataContext, merged); - return ResourceApk.of(processed, resourceDeps, DataBinding.contextFrom(ruleContext)); + return ResourceApk.of( + processed, + resourceDeps, + DataBinding.contextFrom(ruleContext, dataContext.getAndroidConfig())); } /* Creates an incremental apk from assets and data. */ @@ -550,12 +556,19 @@ public final class ApplicationManifest { .getFragment(AndroidConfiguration.class) .throwOnResourceConflict()) .setPackageUnderTest(null) - .build(dataContext, resourceContainer, DataBinding.contextFrom(ruleContext)); + .build( + dataContext, + resourceContainer, + DataBinding.contextFrom(ruleContext, dataContext.getAndroidConfig())); // Intentionally skip building an R class JAR - incremental binaries handle this separately. return ResourceApk.of( - processed, resourceDeps, proguardCfg, null, DataBinding.contextFrom(ruleContext)); + processed, + resourceDeps, + proguardCfg, + null, + DataBinding.contextFrom(ruleContext, dataContext.getAndroidConfig())); } /** Packages up the manifest with resource and assets from the rule and dependent resources. */ @@ -636,7 +649,10 @@ public final class ApplicationManifest { .setRTxtOut(resourceContainer.getRTxt()) .setSymbols(resourceContainer.getSymbols()) .setSourceJarOut(resourceContainer.getJavaSourceJar()) - .build(dataContext, resourceContainer, DataBinding.contextFrom(ruleContext)); + .build( + dataContext, + resourceContainer, + DataBinding.contextFrom(ruleContext, dataContext.getAndroidConfig())); ResourceContainer finalContainer = new RClassGeneratorActionBuilder() |