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

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

Merge "clean up RELEASE_ACONFIG_VALUE_SETS" into main

parents e8cb9178 8e2a6b1f

cmd/release_config/release_config/main.go

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ func main() { 
	flag.BoolVar(&textproto, "textproto", true, "write artifacts as text protobuf")

	flag.BoolVar(&json, "json", true, "write artifacts as json")

	flag.BoolVar(&pb, "pb", true, "write artifacts as binary protobuf")

	flag.BoolVar(&allMake, "all_make", true, "write makefiles for all release configs")

	flag.BoolVar(&allMake, "all_make", false, "write makefiles for all release configs")

	flag.BoolVar(&useBuildVar, "use_get_build_var", false, "use get_build_var PRODUCT_RELEASE_CONFIG_MAPS")

	flag.BoolVar(&guard, "guard", true, "whether to guard with RELEASE_BUILD_FLAGS_IN_PROTOBUF")

cmd/release_config/release_config_lib/release_config.go

+2 −1
Original line number Diff line number Diff line
@@ -91,7 +91,8 @@ func (config *ReleaseConfig) InheritConfig(iConfig *ReleaseConfig) error { 
			return fmt.Errorf("Could not inherit flag %s from %s", name, iConfig.Name)

		}

		if name == "RELEASE_ACONFIG_VALUE_SETS" {

			if len(fa.Traces) > 0 {

			// If there is a value assigned, add the trace.

			if len(fa.Value.GetStringValue()) > 0 {

				myFa.Traces = append(myFa.Traces, fa.Traces...)

				myFa.Value = &rc_proto.Value{Val: &rc_proto.Value_StringValue{

					myFa.Value.GetStringValue() + " " + fa.Value.GetStringValue()}}