diff options
| author |  asteinb <asteinb@google.com> | 2018-05-22 07:03:03 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-22 07:04:36 -0700 |
| commit | 8b6ddbbbe1c1a2f2b62979ffa4fdfed697258ac0 (patch) | |
| tree | de8d909f3ccb3acc0d811972b4e72f71bedad548 /src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java | |
| parent | 5c4f3b59fb4aa06da2c368c764cf0d9056ab287a (diff) | |
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
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java index 5ab5c81b0e..d70dbcaf7c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java @@ -195,10 +195,11 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { // Retrieve and compile the resources defined on the android_binary rule. AndroidResources.validateRuleContext(ruleContext); + final AndroidDataContext dataContext = androidSemantics.makeContextForNative(ruleContext); final ApplicationManifest applicationManifest; final ResourceApk resourceApk; - if (AndroidResources.decoupleDataProcessing(ruleContext)) { + if (AndroidResources.decoupleDataProcessing(dataContext)) { StampedAndroidManifest manifest = AndroidManifest.fromAttributes(ruleContext, androidSemantics).mergeWithDeps(ruleContext); applicationManifest = @@ -324,7 +325,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { MobileInstallResourceApks mobileInstallResourceApks = AndroidBinaryMobileInstall.createMobileInstallResourceApks( - ruleContext, applicationManifest, resourceDeps); + ruleContext, dataContext, applicationManifest, resourceDeps); return createAndroidBinary( ruleContext, |