diff options
| author | mosimchah <mosimchah@gmail.com> | 2025-12-02 09:26:21 -0500 |
|---|---|---|
| committer | mosimchah <mosimchah@gmail.com> | 2025-12-02 09:26:21 -0500 |
| commit | 278dd9b39c5a3de6320e17d3dd1d10bf447bcc49 (patch) | |
| tree | 333c700c958401ad1ef3446d93eee54dac639cfa /tools/ide_query/ide_query.go | |
| parent | 9b9f43f3305e3304678676813d1fd5945a5f40bf (diff) | |
| parent | 00fcf469ba572bbce3f7c81fb346cccdbfa04219 (diff) | |
Merge branch 'lineage-23.1' of https://github.com/LineageOS/android_build into HEADw16.1
* 'lineage-23.1' of https://github.com/LineageOS/android_build: (415 commits)
Exclude perf-setup-sh from userdebug builds
Reapply "Drop legacy vboot support."
Revert "build: Enable super image build rules depending on single super block device"
Version bump to BP3A.250905.014 [core/build_id.mk]
Version bump to BP3A.250905.013 [core/build_id.mk]
Version bump to BP3A.250905.012 [core/build_id.mk]
Version bump to BP3A.250905.011 [core/build_id.mk]
Version bump to BP3A.250905.007.W1 [core/build_id.mk]
Version bump to BP3A.250905.005.X5 [core/build_id.mk]
Add apexd.mainline_patch_level_2 to PRODUCT_PACKAGES
Version bump to BP3A.250905.009 [core/build_id.mk]
Version bump to BP3A.250905.008 [core/build_id.mk]
Version bump to BP3A.250905.005.X4 [core/build_id.mk]
Version bump to BP3A.250905.005.Y1 [core/build_id.mk]
Version bump to BP3A.250905.007 [core/build_id.mk]
Version bump to BP3A.250905.005.X3 [core/build_id.mk]
Version bump to BP3A.250905.005.X2 [core/build_id.mk]
Version bump to BP3A.250905.005.X1 [core/build_id.mk]
Version bump to BP3A.250905.006 [core/build_id.mk]
Version bump to BP3A.250905.005 [core/build_id.mk]
...
Change-Id: I84161b0f013eb40002a433053b9383240274e9ea
Diffstat (limited to 'tools/ide_query/ide_query.go')
| -rw-r--r-- | tools/ide_query/ide_query.go | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/tools/ide_query/ide_query.go b/tools/ide_query/ide_query.go index 6caa29c1f3..075e136e61 100644 --- a/tools/ide_query/ide_query.go +++ b/tools/ide_query/ide_query.go @@ -20,6 +20,7 @@ package main import ( "bytes" + "cmp" "container/list" "context" "encoding/json" @@ -299,7 +300,18 @@ func findJavaModules(paths []string, modules map[string]*javaModule) map[string] for name := range modules { keys = append(keys, name) } - slices.Sort(keys) + slices.SortFunc(keys, func(k1, k2 string) int { + // Some libraries use annotations by setting annotations_enabled: true. + // To enable IDE integration for such libraries, prefer the non package-private + // version of the annotations library. + if k1 == "stub-annotations" && k2 == "private-stub-annotations" { + return -1 + } else if k1 == "private-stub-annotations" && k2 == "stub-annotations" { + return 1 + } else { + return cmp.Compare(k1, k2) + } + }) for _, name := range keys { if strings.HasSuffix(name, ".impl") { continue |