StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I8854e78a7d0803144638039e55b4f1c4994e3303
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-08-11 01:55:36 +00:00
committed by Automerger Merge Worker
parent 4189ebdbd5 ad3ce4ccb0
commit 7da2356b0a
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/config.go
View File

@@ -433,10 +433,6 @@ func saveToBazelConfigFile(config *ProductVariables, outDir string) error {
t := reflect.TypeOf(p.Product_variables) t := reflect.TypeOf(p.Product_variables)
for i := 0; i < t.NumField(); i++ { for i := 0; i < t.NumField(); i++ {
f := t.Field(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") archVariant := proptools.HasTag(f, "android", "arch_variant")
if mainProductVariablesStructField, ok := allProductVariablesType.FieldByName(f.Name); ok { if mainProductVariablesStructField, ok := allProductVariablesType.FieldByName(f.Name); ok {
productVariablesInfo[f.Name] = productVariableStarlarkRepresentation{ productVariablesInfo[f.Name] = productVariableStarlarkRepresentation{

5
android/variable.go
View File

@@ -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 { Uml struct {
Cppflags []string Cppflags []string
} }