diff options
| author | Jihoon Kang <jihoonkang@google.com> | 2024-05-03 23:08:12 +0000 |
|---|---|---|
| committer | Jihoon Kang <jihoonkang@google.com> | 2024-05-04 00:06:59 +0000 |
| commit | 248cc0072c71de6b778b82d9ebe4c7fb6bf82bdc (patch) | |
| tree | 56e3a159d4eebcbce83c02f65f44521175c85765 | |
| parent | 2ddb22ce99d56fdaf0ce65726d68c068b3dc3247 (diff) | |
| download | soong-248cc0072c71de6b778b82d9ebe4c7fb6bf82bdc.tar.gz | |
Correct the order of the SdkKinds
Currently, all sdkKind enums are ordered from the narrower api surface to
the wider api surface, with the exception of the toolchain api surface.
This change corrects the order of the toolchain api surface so that the
enum entries are sorted in the correct order.
Test: m nothing --no-skip-soong-tests
Bug: 338660802
Change-Id: Iad4205c9ce1a83be2f7d80647366fba78e9805ca
| -rw-r--r-- | android/sdk_version.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/android/sdk_version.go b/android/sdk_version.go index b2ff960ee..01b55d0da 100644 --- a/android/sdk_version.go +++ b/android/sdk_version.go @@ -40,9 +40,15 @@ type SdkContext interface { // SdkKind represents a particular category of an SDK spec like public, system, test, etc. type SdkKind int +// These are generally ordered from the narrower sdk version to the wider sdk version, +// but not all entries have a strict subset/superset relationship. +// For example, SdkTest and SdkModule do not have a strict subset/superset relationship but both +// are supersets of SdkSystem. +// The general trend should be kept when an additional sdk kind is added. const ( SdkInvalid SdkKind = iota SdkNone + SdkToolchain // API surface provided by ART to compile other API domains SdkCore SdkCorePlatform SdkIntraCore // API surface provided by one core module to another @@ -53,7 +59,6 @@ const ( SdkModule SdkSystemServer SdkPrivate - SdkToolchain // API surface provided by ART to compile other API domains ) // String returns the string representation of this SdkKind |