Merge "crunch_flags: handle non-string ACONFIG_VALUE_SETS" into main am: 7b48992a1a

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

Change-Id: Ib6342a6c3409ed18c804aec3087910a9eafb7987
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
LaMont Jones
2024-05-09 22:37:02 +00:00
committed by Automerger Merge Worker

View File

@@ -137,7 +137,9 @@ func ProcessBuildFlags(dir string, namespaceMap map[string]string) error {
workflow := rc_proto.Workflow(rc_proto.Workflow_PREBUILT)
switch {
case declName == "RELEASE_ACONFIG_VALUE_SETS":
rootAconfigModule = declValue[1 : len(declValue)-1]
if strings.HasPrefix(declValue, "\"") {
rootAconfigModule = declValue[1 : len(declValue)-1]
}
continue
case strings.HasPrefix(declValue, "\""):
// String values mean that the flag workflow is (most likely) either MANUAL or PREBUILT.