Add libcore API needed by framework to core.platform.api.stubs
Tested by adding a dependency from framework to core.platform.api.stubs
and modifying the build to disable link type checking.
Test: make checkbuild
Bug: 113148576
Change-Id: I618ade912f8cb4429b441a610ea16a9aa16c3398
diff --git a/non_openjdk_java_files.bp b/non_openjdk_java_files.bp
index 2ab257d..12c55b4 100644
--- a/non_openjdk_java_files.bp
+++ b/non_openjdk_java_files.bp
@@ -69,6 +69,10 @@
"libart/src/main/java/dalvik/system/VMRuntime.java",
"libart/src/main/java/dalvik/system/VMStack.java",
"dalvik/src/main/java/dalvik/system/ZygoteHooks.java",
+ "dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/Chunk.java",
+ "dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/ChunkHandler.java",
+ "dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/DdmServer.java",
+ "dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/DdmVmInternal.java",
"libart/src/main/java/java/lang/AndroidHardcodedSystemProperties.java",
"libart/src/main/java/java/lang/Daemons.java",
"libart/src/main/java/java/lang/DexCache.java",
@@ -157,23 +161,35 @@
"luni/src/main/java/javax/xml/xpath/XPathFunctionResolver.java",
"luni/src/main/java/javax/xml/xpath/XPathVariableResolver.java",
"luni/src/main/java/libcore/api/CorePlatformApi.java",
+ "luni/src/main/java/libcore/icu/DateIntervalFormat.java",
"luni/src/main/java/libcore/api/Hide.java",
"luni/src/main/java/libcore/api/IntraCoreApi.java",
"luni/src/main/java/libcore/icu/ICU.java",
"luni/src/main/java/libcore/icu/LocaleData.java",
+ "luni/src/main/java/libcore/icu/RelativeDateTimeFormatter.java",
+ "luni/src/main/java/libcore/internal/StringPool.java",
+ "luni/src/main/java/libcore/io/DropBox.java",
+ "luni/src/main/java/libcore/io/EventLogger.java",
+ "luni/src/main/java/libcore/io/IoBridge.java",
"luni/src/main/java/libcore/io/IoUtils.java",
"luni/src/main/java/libcore/io/Libcore.java",
+ "luni/src/main/java/libcore/io/Memory.java",
"luni/src/main/java/libcore/io/Os.java",
"luni/src/main/java/libcore/io/Streams.java",
"luni/src/main/java/libcore/mmodule/libart/DemoLibartClass.java",
"luni/src/main/java/libcore/net/MimeUtils.java",
"luni/src/main/java/libcore/net/NetworkSecurityPolicy.java",
+ "luni/src/main/java/libcore/net/event/NetworkEventDispatcher.java",
+ "luni/src/main/java/libcore/util/ArrayUtils.java",
"luni/src/main/java/libcore/util/CountryTimeZones.java",
"luni/src/main/java/libcore/util/CountryZonesFinder.java",
"luni/src/main/java/libcore/util/EmptyArray.java",
"luni/src/main/java/libcore/util/HexEncoding.java",
"luni/src/main/java/libcore/util/NativeAllocationRegistry.java",
+ "luni/src/main/java/libcore/util/SneakyThrow.java",
"luni/src/main/java/libcore/util/TimeZoneFinder.java",
+ "luni/src/main/java/libcore/util/XmlObjectFactory.java",
+ "luni/src/main/java/libcore/util/ZoneInfo.java",
"luni/src/main/java/libcore/util/ZoneInfoDB.java",
"json/src/main/java/org/json/JSON.java",
"json/src/main/java/org/json/JSONArray.java",
@@ -271,29 +287,21 @@
"luni/src/main/java/android/system/UnixSocketAddress.java",
"luni/src/main/java/java/net/AddressCache.java",
"luni/src/main/java/libcore/icu/CollationKeyICU.java",
- "luni/src/main/java/libcore/icu/DateIntervalFormat.java",
"luni/src/main/java/libcore/icu/DateTimeFormat.java",
"luni/src/main/java/libcore/icu/DateUtilsBridge.java",
"luni/src/main/java/libcore/icu/NativeConverter.java",
- "luni/src/main/java/libcore/icu/RelativeDateTimeFormatter.java",
"luni/src/main/java/libcore/icu/TimeZoneNames.java",
- "luni/src/main/java/libcore/internal/StringPool.java",
"luni/src/main/java/libcore/io/AsynchronousCloseMonitor.java",
"luni/src/main/java/libcore/io/ClassPathURLStreamHandler.java",
"luni/src/main/java/libcore/io/BlockGuardOs.java",
"luni/src/main/java/libcore/io/BufferIterator.java",
- "luni/src/main/java/libcore/io/DropBox.java",
- "luni/src/main/java/libcore/io/EventLogger.java",
"luni/src/main/java/libcore/io/ForwardingOs.java",
- "luni/src/main/java/libcore/io/IoBridge.java",
"luni/src/main/java/libcore/io/IoTracker.java",
"luni/src/main/java/libcore/io/Linux.java",
- "luni/src/main/java/libcore/io/Memory.java",
"luni/src/main/java/libcore/io/MemoryMappedFile.java",
"luni/src/main/java/libcore/io/NioBufferIterator.java",
"luni/src/main/java/libcore/io/SizeOf.java",
"luni/src/main/java/libcore/math/MathUtils.java",
- "luni/src/main/java/libcore/net/event/NetworkEventDispatcher.java",
"luni/src/main/java/libcore/net/event/NetworkEventListener.java",
"luni/src/main/java/libcore/net/http/HttpDate.java",
"luni/src/main/java/libcore/net/http/ResponseUtils.java",
@@ -309,7 +317,6 @@
"luni/src/main/java/libcore/reflect/TypeVariableImpl.java",
"luni/src/main/java/libcore/reflect/Types.java",
"luni/src/main/java/libcore/reflect/WildcardTypeImpl.java",
- "luni/src/main/java/libcore/util/ArrayUtils.java",
"luni/src/main/java/libcore/util/CharsetUtils.java",
"luni/src/main/java/libcore/util/BasicLruCache.java",
"luni/src/main/java/libcore/util/CollectionUtils.java",
@@ -317,15 +324,8 @@
"luni/src/main/java/libcore/util/Nullable.java",
"luni/src/main/java/libcore/util/NullFromTypeParam.java",
"luni/src/main/java/libcore/util/Objects.java",
- "luni/src/main/java/libcore/util/SneakyThrow.java",
"luni/src/main/java/libcore/util/TimeZoneDataFiles.java",
- "luni/src/main/java/libcore/util/XmlObjectFactory.java",
- "luni/src/main/java/libcore/util/ZoneInfo.java",
"dalvik/src/main/java/org/apache/harmony/dalvik/NativeTestTarget.java",
- "dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/Chunk.java",
- "dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/ChunkHandler.java",
- "dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/DdmServer.java",
- "dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/DdmVmInternal.java",
"luni/src/main/java/org/apache/harmony/xml/ExpatAttributes.java",
"luni/src/main/java/org/apache/harmony/xml/ExpatException.java",
"luni/src/main/java/org/apache/harmony/xml/ExpatParser.java",