Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18244633 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove pdk product variable" into main

parents 19e00b35 8dc9e917

android/config.go

+0 −4
Original line number Diff line number Diff line
@@ -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

+0 −5
Original line number Diff line number Diff line
@@ -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

		}