diff options
| author |  corysmith <corysmith@google.com> | 2017-06-30 22:55:47 +0200 |
|---|---|---|
| committer |  Marcel Hlopko <hlopko@google.com> | 2017-07-03 09:06:42 +0200 |
| commit | 77b97e3c3f3bece4c1959cd47007e0e39e702468 (patch) | |
| tree | 252137ce9cd8310e1a2fa8c6bb88200a99c0e801 /src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java | |
| parent | a3ce0910e3143f1391fe1f4219bda12ef21d12d1 (diff) | |
Enable aapt2 support in binary actions.
RELNOTES: None
PiperOrigin-RevId: 160684786
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 | 9 |
1 files changed, 6 insertions, 3 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 d9ce0a1516..a9d096ee2a 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 @@ -32,6 +32,7 @@ import com.google.devtools.build.lib.analysis.actions.SpawnAction; import com.google.devtools.build.lib.analysis.config.CompilationMode; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException; +import com.google.devtools.build.lib.rules.android.AndroidConfiguration.AndroidAaptVersion; import com.google.devtools.build.lib.rules.android.AndroidConfiguration.AndroidManifestMerger; import com.google.devtools.build.lib.rules.android.ResourceContainer.Builder.JavaPackageSource; import com.google.devtools.build.lib.rules.android.ResourceContainer.ResourceType; @@ -598,6 +599,7 @@ public final class ApplicationManifest { .setJavaPackage(resourceContainer.getJavaPackage()) .withPrimary(resourceContainer) .withDependencies(resourceDeps) + .setDataBindingInfoZip(dataBindingInfoZip) .setMergedResourcesOut(mergedResources) .setManifestOut(manifestOut) .setClassJarOut(rJavaClassJar) @@ -638,11 +640,12 @@ public final class ApplicationManifest { .setDataBindingInfoZip(dataBindingInfoZip) .setApplicationId(manifestValues.get("applicationId")) .setVersionCode(manifestValues.get("versionCode")) - .setVersionName(manifestValues.get("versionName")); - builder.setFeatureOf(featureOf); - builder.setFeatureAfter(featureAfter); + .setVersionName(manifestValues.get("versionName")) + .setFeatureOf(featureOf) + .setFeatureAfter(featureAfter); if (!incremental) { builder + .targetAaptVersion(AndroidAaptVersion.AAPT) .setRTxtOut(resourceContainer.getRTxt()) .setSymbols(resourceContainer.getSymbols()) .setSourceJarOut(resourceContainer.getJavaSourceJar()); |