diff options
author | Googler <noreply@google.com> | 2018-08-10 14:25:30 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-08-10 14:26:59 -0700 |
commit | 8f9416cf6057f67170d7f4ced72e43d9682f331b (patch) | |
tree | ffd532f38fe67a8b224d8583623f73c898ccc791 /src/tools/android/java/com/google/devtools | |
parent | 287c1e7136ea07a538d57d3ad4d98aa36987736b (diff) |
update data binding to 3.2.0 release (gradle)
This CL updates the data binding to the latest public release.
RELNOTES: update data binding to 3.2.0
PiperOrigin-RevId: 208267702
Diffstat (limited to 'src/tools/android/java/com/google/devtools')
-rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java index 02b9a5e310..1e204926e4 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java +++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java @@ -24,12 +24,9 @@ import com.android.builder.model.AaptOptions; import com.android.ide.common.internal.CommandLineRunner; import com.android.ide.common.internal.ExecutorSingleton; import com.android.ide.common.internal.LoggedErrorException; -import com.android.io.FileWrapper; -import com.android.io.StreamException; import com.android.repository.Revision; import com.android.utils.ILogger; import com.android.utils.StdLogger; -import com.android.xml.AndroidManifest; import com.google.common.base.Joiner; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableList; @@ -64,7 +61,6 @@ import java.util.Map; import java.util.concurrent.ExecutionException; import java.util.concurrent.Executors; import java.util.logging.Logger; -import javax.xml.xpath.XPathExpressionException; /** Provides a wrapper around the AOSP build tools for resource processing. */ public class AndroidResourceProcessor { @@ -515,7 +511,6 @@ public class AndroidResourceProcessor { ProcessXmlOptions options = new ProcessXmlOptions(); options.setAppId(packagePath); - options.setLibrary(variantType == VariantType.LIBRARY); options.setResInput(resourceDir.toFile()); options.setResOutput(processedResourceDir.toFile()); options.setLayoutInfoOutput(dataBindingInfoOut.toFile()); @@ -523,19 +518,6 @@ public class AndroidResourceProcessor { options.setZipLayoutInfo(shouldZipDataBindingInfo); try { - Object minSdk = AndroidManifest.getMinSdkVersion(new FileWrapper(androidManifest.toFile())); - if (minSdk instanceof Integer) { - options.setMinSdk(((Integer) minSdk).intValue()); - } else { - // TODO(bazel-team): Enforce the minimum SDK check. - options.setMinSdk(15); - } - } catch (XPathExpressionException | StreamException e) { - // TODO(bazel-team): Enforce the minimum SDK check. - options.setMinSdk(15); - } - - try { AndroidDataBinding.doRun(options); } catch (Throwable t) { throw new RuntimeException(t); |