Revert "Feature flags support in Chooser" am: 6e24587897

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/21141059

Change-Id: I0633236fcc385da7488fae41642f4d3dd38ea52e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 1 insertions, 23 deletions

diff --git a/Android.bp b/Android.bp
index 9238a7e2..124a4b87 100644
--- a/Android.bp
+++ b/Android.bp
@@ -31,34 +31,13 @@ license {
     ],
 }
 
-filegroup {
-    name: "ReleaseSources",
-    srcs: [
-        "java/src-release/**/*.kt",
-    ],
-}
-
-filegroup {
-    name: "DebugSources",
-    srcs: [
-        "java/src-debug/**/*.kt",
-    ],
-}
-
 android_library {
     name: "IntentResolver-core",
     min_sdk_version: "current",
     srcs: [
         "java/src/**/*.java",
         "java/src/**/*.kt",
-        ":ReleaseSources",
     ],
-    product_variables: {
-        debuggable: {
-            srcs: [":DebugSources"],
-            exclude_srcs: [":ReleaseSources"],
-        }
-    },
     resource_dirs: [
         "java/res",
     ],
@@ -79,11 +58,10 @@ android_library {
         "kotlinx-coroutines-android",
         "//external/kotlinc:kotlin-annotations",
         "guava",
-        "SystemUIFlagsLib",
     ],
 
     lint: {
-        strict_updatability_linting: false,
+        strict_updatability_linting: true,
     },
 }