From c5dce1fd008d7e13ea8b735b80281867a38c9aef Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 20 Nov 2019 22:32:16 -0800
Subject: [PATCH] Remove uses of 'aapt_version' attribute.

Bazel 1.0 [1] enables aapt2 by default, so this attribute doesn't do anything.
Bazel 2.0 [2] will prohibit [3] any uses of this attribute.

This also means that building with Bazel versions <1.0 would potentially use aapt1, but this might actually be a good thing.  TF has a minimum version requirement of 0.19, and many aapt2-related fixes have been made in the 0.2x series.

[1] https://blog.bazel.build/2019/10/10/bazel-1.0.html
[2] https://github.com/bazelbuild/bazel/issues/10000
[3] https://github.com/bazelbuild/bazel/blob/b3f54f673259604ea526c560d4abd144bd267295/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java#L262
[4] https://github.com/tensorflow/tensorflow/blob/dc73a9889fc1ebedaf150da2a0c1dfed11da3858/WORKSPACE#L92

PiperOrigin-RevId: 281679131
Change-Id: I47818b8b59eeb78a8c439523ce72e388428f2da9
---
 tensorflow/examples/android/BUILD                         | 1 -
 tensorflow/lite/java/demo/app/src/main/BUILD              | 1 -
 tensorflow/lite/java/ovic/demo/app/BUILD                  | 1 -
 tensorflow/lite/models/smartreply/demo/app/src/main/BUILD | 1 -
 4 files changed, 4 deletions(-)

diff --git a/tensorflow/examples/android/BUILD b/tensorflow/examples/android/BUILD
index 8baf6229c4e..506d3be05df 100644
--- a/tensorflow/examples/android/BUILD
+++ b/tensorflow/examples/android/BUILD
@@ -66,7 +66,6 @@ android_binary(
     srcs = glob([
         "src/**/*.java",
     ]),
-    aapt_version = "aapt2",
     # Package assets from assets dir as well as all model targets. Remove undesired models
     # (and corresponding Activities in source) to reduce APK size.
     assets = [
diff --git a/tensorflow/lite/java/demo/app/src/main/BUILD b/tensorflow/lite/java/demo/app/src/main/BUILD
index 420a81c50d0..49a5f64d270 100644
--- a/tensorflow/lite/java/demo/app/src/main/BUILD
+++ b/tensorflow/lite/java/demo/app/src/main/BUILD
@@ -8,7 +8,6 @@ package(
 android_binary(
     name = "TfLiteCameraDemo",
     srcs = glob(["java/**/*.java"]),
-    aapt_version = "aapt2",
     assets = [
         "//tensorflow/lite/java/demo/app/src/main/assets:labels_mobilenet_quant_v1_224.txt",
         "@tflite_mobilenet_quant//:mobilenet_v1_1.0_224_quant.tflite",
diff --git a/tensorflow/lite/java/ovic/demo/app/BUILD b/tensorflow/lite/java/ovic/demo/app/BUILD
index e0bd5341f74..7f3b5fc7f2d 100644
--- a/tensorflow/lite/java/ovic/demo/app/BUILD
+++ b/tensorflow/lite/java/ovic/demo/app/BUILD
@@ -11,7 +11,6 @@ android_binary(
     srcs = [
         "OvicBenchmarkerActivity.java",
     ],
-    aapt_version = "aapt2",
     assets = [
         "//tensorflow/lite/java/ovic/src/testdata:coco_labels.txt",
         "//tensorflow/lite/java/ovic/src/testdata:labels.txt",
diff --git a/tensorflow/lite/models/smartreply/demo/app/src/main/BUILD b/tensorflow/lite/models/smartreply/demo/app/src/main/BUILD
index 1f074591458..8c489cf729f 100644
--- a/tensorflow/lite/models/smartreply/demo/app/src/main/BUILD
+++ b/tensorflow/lite/models/smartreply/demo/app/src/main/BUILD
@@ -20,7 +20,6 @@ filegroup(
 android_binary(
     name = "SmartReplyDemo",
     srcs = glob(["java/**/*.java"]),
-    aapt_version = "aapt2",
     assets = [":assets"],
     assets_dir = "",
     custom_package = "com.example.android.smartreply",