diff options
| author | 2023-12-08 22:45:33 +0000 | |
|---|---|---|
| committer | 2023-12-08 22:45:33 +0000 | |
| commit | bac244d6cbb4a8889a5cbb9a566ee362ee4ac42b (patch) | |
| tree | e9006c2f1b21a4558fc07f5fe9ffb9fe0bb26b8e | |
| parent | 029533e94fb2470240969b5b46b67b3889f1076c (diff) | |
| parent | 1a91da57f80dd62697e863cbf0d989dbbc078800 (diff) | |
Merge "Remove the code for bazel when reading ReleaseAconfigValueSets." into main am: 65287d5dc2 am: 1a91da57f8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864661
Change-Id: I47474287285a9fefa630b79ada5623fae56c20ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | android/config.go | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/android/config.go b/android/config.go index 929350584..f6a813b6b 100644 --- a/android/config.go +++ b/android/config.go @@ -210,22 +210,7 @@ func (c Config) ReleaseVersion() string { // The aconfig value set passed to aconfig, derived from RELEASE_VERSION func (c Config) ReleaseAconfigValueSets() []string { - // This logic to handle both Soong module name and bazel target is temporary in order to - // provide backward compatibility where aosp and internal both have the release - // aconfig value set but can't be updated at the same time to use bazel target - var valueSets []string - for _, valueSet := range c.config.productVariables.ReleaseAconfigValueSets { - value := strings.Split(valueSet, ":") - valueLen := len(value) - if valueLen > 2 { - // This shouldn't happen as this should be either a module name or a bazel target path. - panic(fmt.Errorf("config file: invalid value for release aconfig value sets: %s", valueSet)) - } - if valueLen > 0 { - valueSets = append(valueSets, value[valueLen-1]) - } - } - return valueSets + return c.config.productVariables.ReleaseAconfigValueSets } // The flag default permission value passed to aconfig |