Merge "Remove pdk product variable" into main am: 1824463396 am: f2d88a1ab9 am: 98746a4fde

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2703674

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

android/config.go

@@ -433,10 +433,6 @@ func saveToBazelConfigFile(config *ProductVariables, outDir string) error {
 	t := reflect.TypeOf(p.Product_variables)
 	for i := 0; i < t.NumField(); i++ {
 		f := t.Field(i)
-		if f.Name == "Pdk" {
-			// Pdk is deprecated and has no effect as of aosp/1319667
-			continue
-		}
 		archVariant := proptools.HasTag(f, "android", "arch_variant")
 		if mainProductVariablesStructField, ok := allProductVariablesType.FieldByName(f.Name); ok {
 			productVariablesInfo[f.Name] = productVariableStarlarkRepresentation{

android/variable.go

@@ -160,11 +160,6 @@ type variableProperties struct {
 			}
 		}
 
-		// Deprecated, has no effect as of aosp/1319667
-		Pdk struct {
-			Enabled *bool `android:"arch_variant"`
-		} `android:"arch_variant"`
-
 		Uml struct {
 			Cppflags []string
 		}