From 680e03847ddd27b5082ab7f3240be528a859f15d Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Fri, 7 Sep 2018 12:04:09 -0700
Subject: [PATCH] tapl should be java_library

Bug: 113683301

Tests failures that we are trying to fix.
https://sponge.corp.google.com/invocations?searchFor=target%3Aandroid.platform.systemui.tests.jank%20label%3Ab%2Fgit_master

When the build rule is android_library, AndroidManifest.xml is pulled into
the the final apk that is being built. Hence, the platform jank and platform test
AndroidManifest.xml is extended with the one we have for Launcher3.
This causes the tests to fail due to existence of disambiguation screen.
We do not want this behavior.

Change-Id: I1a551abf37bb75b4efa8a5e5324ab1b4d8a3eb13
---
 Android.bp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Android.bp b/Android.bp
index ae54307855..78f7277218 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-android_library {
+java_library {
     name: "launcher-aosp-tapl",
     static_libs: [
         "androidx.annotation_annotation",