Revert "Update all_aconfig_declarations for multiple API surfaces"

Revert submission 31514258-aconfig_final_wear

Reason for revert: DroidMonitor: Potential culprit for http://b/393373077 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Reverted changes: /q/submissionid:31514258-aconfig_final_wear

Change-Id: I155974b0aeec9b75283568f5a1c84c76125b9362

2 files changed, 22 insertions, 46 deletions

diff --git a/aconfig/Android.bp b/aconfig/Android.bp
index e8f7616d4..6daa63c55 100644
--- a/aconfig/Android.bp
+++ b/aconfig/Android.bp
@@ -34,22 +34,17 @@ bootstrap_go_package {
 // but other verticals/platforms can override via soong config setting.
 all_aconfig_declarations {
     name: "all_aconfig_declarations",
-    api_surfaces: {
-        platform: {
-            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",
-        },
-        wear: {
-            api_signature_files: [
-                ":wear-sdk-api-current.txt",
-                ":wear-sdk-api-system-current.txt",
-            ],
-            finalized_flags_file: ":latest-finalized-wear-flags",
-        },
-    },
+    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",
+        ],
+    }),
+    finalized_flags_file: ":latest-finalized-flags",
 }
diff --git a/aconfig/all_aconfig_declarations.go b/aconfig/all_aconfig_declarations.go
index 6f6a11e9c..ec200997e 100644
--- a/aconfig/all_aconfig_declarations.go
+++ b/aconfig/all_aconfig_declarations.go
@@ -19,6 +19,8 @@ import (
 	"slices"
 
 	"android/soong/android"
+
+	"github.com/google/blueprint/proptools"
 )
 
 // A singleton module that collects all of the aconfig flags declared in the
@@ -40,18 +42,9 @@ type allAconfigReleaseDeclarationsSingleton struct {
 	intermediateTextProtoPath   android.OutputPath
 }
 
-type apiSurfaceContributorStruct struct {
-	Api_signature_files  []string `android:"arch_variant,path"`
-	Finalized_flags_file string   `android:"arch_variant,path"`
-}
-
-type apiSurfacesStruct struct {
-	Platform apiSurfaceContributorStruct
-	Wear     apiSurfaceContributorStruct
-}
-
 type allAconfigReleaseDeclarationsProperties struct {
-	Api_surfaces apiSurfacesStruct
+	Api_signature_files  proptools.Configurable[[]string] `android:"arch_variant,path"`
+	Finalized_flags_file string                           `android:"arch_variant,path"`
 }
 
 type allAconfigDeclarationsSingleton struct {
@@ -71,26 +64,16 @@ func (this *allAconfigDeclarationsSingleton) sortedConfigNames() []string {
 }
 
 func (this *allAconfigDeclarationsSingleton) GenerateAndroidBuildActions(ctx android.ModuleContext) {
-	// PLATFORM API surface (android platform: API surface provided via android.jar)
-	platformOutput := this.GenerateFinalizedFlagsForApiSurfaces(ctx, this.properties.Api_surfaces.Platform, "platform")
-	// WEAR API surface (wear-os platform: API surface provided via wear-sdk.jar)
-	wearOutput := this.GenerateFinalizedFlagsForApiSurfaces(ctx, this.properties.Api_surfaces.Wear, "wear")
-
-	ctx.Phony("all_aconfig_declarations", platformOutput, wearOutput)
-}
-
-func (this *allAconfigDeclarationsSingleton) GenerateFinalizedFlagsForApiSurfaces(ctx android.ModuleContext, apiSurface apiSurfaceContributorStruct, surfaceName string) android.Path {
 	apiSignatureFiles := android.Paths{}
-	for _, apiSignatureFile := range apiSurface.Api_signature_files {
+	for _, apiSignatureFile := range this.properties.Api_signature_files.GetOrDefault(ctx, nil) {
 		if path := android.PathForModuleSrc(ctx, apiSignatureFile); path != nil {
 			apiSignatureFiles = append(apiSignatureFiles, path)
 		}
 	}
-	finalizedFlagsFile := android.PathForModuleSrc(ctx, apiSurface.Finalized_flags_file)
-	// parsed flags file is a universal blob, used by all API surfaces (contains all known flags)
+	finalizedFlagsFile := android.PathForModuleSrc(ctx, this.properties.Finalized_flags_file)
 	parsedFlagsFile := android.PathForIntermediates(ctx, "all_aconfig_declarations.pb")
 
-	output := android.PathForIntermediates(ctx, "finalized-flags-"+surfaceName+".txt")
+	output := android.PathForIntermediates(ctx, "finalized-flags.txt")
 
 	ctx.Build(pctx, android.BuildParams{
 		Rule:   RecordFinalizedFlagsRule,
@@ -102,8 +85,7 @@ func (this *allAconfigDeclarationsSingleton) GenerateFinalizedFlagsForApiSurface
 			"parsed_flags_file":    "--parsed-flags-file " + parsedFlagsFile.String(),
 		},
 	})
-
-	return output
+	ctx.Phony("all_aconfig_declarations", output)
 }
 
 func (this *allAconfigDeclarationsSingleton) GenerateSingletonBuildActions(ctx android.SingletonContext) {
@@ -172,6 +154,5 @@ func (this *allAconfigDeclarationsSingleton) MakeVars(ctx android.MakeVarsContex
 			ctx.DistForGoalWithFilename(goal, this.releaseMap[rcName].intermediateTextProtoPath, assembleFileName(rcName, "flags.textproto"))
 		}
 	}
-	ctx.DistForGoalWithFilename("sdk", android.PathForIntermediates(ctx, "finalized-flags-platform.txt"), "finalized-flags.txt")
-	ctx.DistForGoalWithFilename("sdk", android.PathForIntermediates(ctx, "finalized-flags-wear.txt"), "apistubs/clockwork/finalized-flags.txt")
+	ctx.DistForGoalWithFilename("sdk", android.PathForIntermediates(ctx, "finalized-flags.txt"), "finalized-flags.txt")
 }