1 files changed, 8 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp
index 721b8fd4..047820e9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -36,6 +36,7 @@ android_library {
     min_sdk_version: "current",
     srcs: [
         "java/src/**/*.java",
+        "java/src/**/*.kt",
     ],
     resource_dirs: [
         "java/res",
@@ -45,7 +46,12 @@ android_library {
 
     static_libs: [
         "androidx.annotation_annotation",
-        "unsupportedappusage",
+        "androidx.concurrent_concurrent-futures",
+        "androidx.recyclerview_recyclerview",
+        "androidx.viewpager_viewpager",
+        "androidx.lifecycle_lifecycle-common-java8",
+        "androidx.lifecycle_lifecycle-extensions",
+        "guava",
     ],
 
     lint: {
@@ -67,10 +73,7 @@ android_app {
         "IntentResolver-core",
     ],
     optimize: {
-        // TODO: consider re-enabling after setting up Proguard rules to
-        // preserve the name of the ChooserGridLayoutManager class, which is
-        // referenced by name in the chooser_list_per_profile layout XML.
-        enabled: false,
+        enabled: true,
     },
     apex_available: [
         "//apex_available:platform",