commit 92d4086fda48216015795230b5b0dc429f7f73f6
author Jonathan Miranda <jonmiranda@google.com> Thu Nov 21 22:16:23 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 21 22:16:23 2019 +0000
tree 0bbbc12a80f4a6997156f06fae70f22c8cb20b50
parent 5e1ecf6d7309a5a2dcda1715a7373e504eb5384a
parent ad7e30f5d7d7235e4f98632d806043421eb7d15a

Merge "Fix bug where icon remains invisible after returning home." into ub-launcher3-master

Android.bp

diff --git a/Android.bp b/Android.bp
index 4c38205..fc99880 100644
--- a/Android.bp
+++ b/Android.bp
@@ -30,3 +30,19 @@
     manifest: "tests/tapl/AndroidManifest.xml",
     platform_apis: true,
 }
+
+java_library_static {
+    name: "launcher-log-protos-lite",
+    srcs: [
+        "protos/*.proto",
+        "proto_overrides/*.proto",
+    ],
+    sdk_version: "current",
+    proto: {
+        type: "lite",
+        local_include_dirs:[
+            "protos",
+            "proto_overrides",
+        ],
+    },
+}

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 31a9960..83fdddc 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -50,7 +50,8 @@
     androidx.test.runner \
     androidx.test.rules \
     androidx.test.uiautomator_uiautomator \
-    mockito-target-minus-junit4
+    mockito-target-minus-junit4 \
+    launcher-log-protos-lite
 
 ifneq (,$(wildcard frameworks/base))
     LOCAL_PRIVATE_PLATFORM_APIS := true