From 6e245878978627b8741c219597c4a02609543969 Mon Sep 17 00:00:00 2001
From: Oli Thompson <olit@google.com>
Date: Mon, 30 Jan 2023 10:03:07 +0000
Subject: Revert "Feature flags support in Chooser"

This reverts commit 33bb96bf4da9ad037d1184c644fd9c26db569ded.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=bramble-user&lkgb=9536619&lkbb=9537444&fkbb=9536627 , bug b/267135531

BUG: b/267135531

Change-Id: I73f5b6c66e27dd0e5a628034604e80523f2acf99
---
 Android.bp | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

(limited to 'Android.bp')

diff --git a/Android.bp b/Android.bp
index 19d2a825..31d7d6d0 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,12 +58,11 @@ android_library {
         "kotlinx-coroutines-android",
         "//external/kotlinc:kotlin-annotations",
         "guava",
-        "SystemUIFlagsLib",
     ],
 
     plugins: ["java_api_finder"],
     lint: {
-        strict_updatability_linting: false,
+        strict_updatability_linting: true,
     },
 }
 
-- 
cgit v1.2.3-59-g8ed1b