commit 7e235884a5bf7bc444bb8ce33c783361f8a4b355
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Jan 27 09:15:49 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 27 09:15:49 2025 -0800
tree f66fd1e1c109bba313ff64290df059ffa9f10483
parent b56ce66b2ba7e1f3a9606a7259640700b0c5ccac
parent f8d5c0ce8a0737984e2054a9e79c08454c0cda7b

Merge "Rename module finalized-flags -> latest-finalized-flags" into main

java/java.go

diff --git a/java/java.go b/java/java.go
index d59c6ca..70ebebe 100644
--- a/java/java.go
+++ b/java/java.go
@@ -2318,6 +2318,7 @@
 	scopeOrderMap["core-platform"] = count + 2
 	scopeOrderMap["intra-core"] = count + 3
 	scopeOrderMap["core-platform-plus-public"] = count + 4
+	scopeOrderMap["core-platform-legacy"] = count + 5
 }
 
 func (al *ApiLibrary) sortApiFilesByApiScope(ctx android.ModuleContext, srcFilesInfo []JavaApiImportInfo) []JavaApiImportInfo {

java/metalava/main-config.xml

diff --git a/java/metalava/main-config.xml b/java/metalava/main-config.xml
index 132f174..c2881ac 100644
--- a/java/metalava/main-config.xml
+++ b/java/metalava/main-config.xml
@@ -28,6 +28,7 @@
     <api-surface name="core"/>
     <!-- These are used in libcore, external/conscrypt and external/icu. -->
     <api-surface name="core-platform" extends="public"/>
+    <api-surface name="core-platform-legacy" extends="public"/>
     <api-surface name="core-platform-plus-public"/>
     <api-surface name="intra-core" extends="public"/>
   </api-surfaces>