Move dalvik.system.VersionCodes to dalvik.annotation.compat
Avoids splitting packages that are part of java.base.
Removes patch_module: "java.base" that was used to work around this
issue.
Bug: 143057012
Test: m checkbuild
Change-Id: Iad65343fd3fde55f2d3b0e68c4bbcd51377d85d9
diff --git a/non_openjdk_java_files.bp b/non_openjdk_java_files.bp
index 4f7a33d..c177256 100644
--- a/non_openjdk_java_files.bp
+++ b/non_openjdk_java_files.bp
@@ -113,7 +113,7 @@
name: "hidden_api_surface_annotation_files",
srcs: [
"dalvik/src/main/java/dalvik/annotation/compat/UnsupportedAppUsage.java",
- "dalvik/src/main/java/dalvik/system/VersionCodes.java",
+ "dalvik/src/main/java/dalvik/annotation/compat/VersionCodes.java",
],
}