summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2025-01-25 03:19:29 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2025-01-25 03:19:29 -0800
commitfe13248538eb18dc9c4522ddf5aee7e9a6ea0a8d (patch)
tree0f369ea8b52ff55970b1c8b42cedb13f5e9c8bd1 /java/java.go
parentcd66fa0df90261f12bb5ece566fe018e883ee438 (diff)
parentd01f0b2c72c1a5160653e47ba68f56105212cc73 (diff)
Merge "Allow java_sdk_library to override the droidstubs api_surface per scope" into main
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go10
1 files changed, 10 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go
index fafe9f964..d59c6ca38 100644
--- a/java/java.go
+++ b/java/java.go
@@ -2310,6 +2310,16 @@ func (al *ApiLibrary) DepsMutator(ctx android.BottomUpMutatorContext) {
var scopeOrderMap = AllApiScopes.MapToIndex(
func(s *apiScope) string { return s.name })
+// Add some extra entries into scopeOrderMap for some special api surface names needed by libcore,
+// external/conscrypt and external/icu and java/core-libraries.
+func init() {
+ count := len(scopeOrderMap)
+ scopeOrderMap["core"] = count + 1
+ scopeOrderMap["core-platform"] = count + 2
+ scopeOrderMap["intra-core"] = count + 3
+ scopeOrderMap["core-platform-plus-public"] = count + 4
+}
+
func (al *ApiLibrary) sortApiFilesByApiScope(ctx android.ModuleContext, srcFilesInfo []JavaApiImportInfo) []JavaApiImportInfo {
for _, srcFileInfo := range srcFilesInfo {
if srcFileInfo.ApiSurface == "" {