From 8dc9e917aa959a2d6d85b8536409c6a92d866b43 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Thu, 10 Aug 2023 10:20:03 -0700 Subject: [PATCH] Remove pdk product variable It has no effect. Test: Presubmits Change-Id: Ia15cd99ce083294a119203c416046e43d20bf87f --- android/config.go | 4 ---- android/variable.go | 5 ----- 2 files changed, 9 deletions(-) diff --git a/android/config.go b/android/config.go index eb894932f..8803d57c5 100644 --- a/android/config.go +++ b/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{ diff --git a/android/variable.go b/android/variable.go index 03a80c161..0b3aaa9f1 100644 --- a/android/variable.go +++ b/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 }