Revert "Create soong config to support other apis for aconfig fi..."

Revert submission 31382652-wear_sdk_api_flags_final

Reason for revert: obsolete with introduction of all_aconfig module extension

Reverted changes: /q/submissionid:31382652-wear_sdk_api_flags_final

Change-Id: I21d8b86381fef157797ea7262f4751a6ac81c392

1 files changed, 6 insertions, 15 deletions

diff --git a/aconfig/Android.bp b/aconfig/Android.bp
index 81277ffc4..a15fe866b 100644
--- a/aconfig/Android.bp
+++ b/aconfig/Android.bp
@@ -31,25 +31,16 @@ bootstrap_go_package {
     pluginFor: ["soong_build"],
 }
 
-// All FlaggedApi flags associated with platform API.
-// By default this uses the platform APIs associated with android.jar
-// but other verticals/platforms can override via soong config setting.
 all_aconfig_declarations {
     name: "all_aconfig_declarations",
     visibility: [
         "//vendor:__subpackages__", // for vendor extensions
     ],
-    api_signature_files: select(soong_config_variable("android_aconfig", "opt_platform_api_srcs"), {
-        "wear_sdk_api_srcs": [
-            ":wear-sdk-api-current.txt",
-            ":wear-sdk-api-system-current.txt",
-        ],
-        default: [
-            ":frameworks-base-api-current.txt",
-            ":frameworks-base-api-system-current.txt",
-            ":frameworks-base-api-system-server-current.txt",
-            ":frameworks-base-api-module-lib-current.txt",
-        ],
-    }),
+    api_signature_files: [
+        ":frameworks-base-api-current.txt",
+        ":frameworks-base-api-system-current.txt",
+        ":frameworks-base-api-system-server-current.txt",
+        ":frameworks-base-api-module-lib-current.txt",
+    ],
     finalized_flags_file: ":latest-finalized-flags",
 }