1 files changed, 64 insertions, 45 deletions
diff --git a/non_openjdk_java_files.bp b/non_openjdk_java_files.bp
index 929b4110d2..3e4083fdef 100644
--- a/non_openjdk_java_files.bp
+++ b/non_openjdk_java_files.bp
@@ -1,6 +1,5 @@
 filegroup {
     name: "non_openjdk_javadoc_files",
-    export_to_make_var: "non_openjdk_javadoc_files",
     srcs: [
         "luni/src/main/java/android/system/ErrnoException.java",
         "luni/src/main/java/android/system/GaiException.java",
@@ -27,6 +26,7 @@ filegroup {
         "luni/src/main/java/android/system/StructTimespec.java",
         "luni/src/main/java/android/system/StructUcred.java",
         "luni/src/main/java/android/system/StructUtsname.java",
+        "luni/src/main/java/android/system/UnixSocketAddress.java",
         "dalvik/src/main/java/dalvik/annotation/AnnotationDefault.java",
         "dalvik/src/main/java/dalvik/annotation/EnclosingClass.java",
         "dalvik/src/main/java/dalvik/annotation/EnclosingMethod.java",
@@ -38,13 +38,16 @@ filegroup {
         "dalvik/src/main/java/dalvik/annotation/TestTarget.java",
         "dalvik/src/main/java/dalvik/annotation/TestTargetClass.java",
         "dalvik/src/main/java/dalvik/annotation/Throws.java",
+        "dalvik/src/main/java/dalvik/annotation/codegen/CovariantReturnType.java",
+        "dalvik/src/main/java/dalvik/annotation/compat/UnsupportedAppUsage.java",
         "dalvik/src/main/java/dalvik/annotation/optimization/CriticalNative.java",
+        "dalvik/src/main/java/dalvik/annotation/optimization/DeadReferenceSafe.java",
         "dalvik/src/main/java/dalvik/annotation/optimization/FastNative.java",
         "dalvik/src/main/java/dalvik/annotation/optimization/ReachabilitySensitive.java",
         "dalvik/src/main/java/dalvik/bytecode/OpcodeInfo.java",
         "dalvik/src/main/java/dalvik/bytecode/Opcodes.java",
-        "libart/src/main/java/dalvik/system/AnnotatedStackTraceElement.java",
         "dalvik/src/main/java/dalvik/system/AllocationLimitError.java",
+        "libart/src/main/java/dalvik/system/AnnotatedStackTraceElement.java",
         "dalvik/src/main/java/dalvik/system/BaseDexClassLoader.java",
         "dalvik/src/main/java/dalvik/system/BlockGuard.java",
         "libart/src/main/java/dalvik/system/ClassExt.java",
@@ -60,9 +63,11 @@ filegroup {
         "dalvik/src/main/java/dalvik/system/NativeStart.java",
         "dalvik/src/main/java/dalvik/system/PathClassLoader.java",
         "dalvik/src/main/java/dalvik/system/PotentialDeadlockError.java",
+        "dalvik/src/main/java/dalvik/system/RuntimeHooks.java",
         "dalvik/src/main/java/dalvik/system/SocketTagger.java",
         "dalvik/src/main/java/dalvik/system/TemporaryDirectory.java",
         "libart/src/main/java/dalvik/system/TransactionAbortError.java",
+        "dalvik/src/main/java/dalvik/system/VersionCodes.java",
         "dalvik/src/main/java/dalvik/system/VMDebug.java",
         "libart/src/main/java/dalvik/system/VMRuntime.java",
         "libart/src/main/java/dalvik/system/VMStack.java",
@@ -154,6 +159,49 @@ filegroup {
         "luni/src/main/java/javax/xml/xpath/XPathFunctionException.java",
         "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/icu/TimeZoneNames.java",
+        "luni/src/main/java/libcore/internal/StringPool.java",
+        "luni/src/main/java/libcore/io/ForwardingOs.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/net/InetAddressUtils.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/timezone/CountryTimeZones.java",
+        "luni/src/main/java/libcore/timezone/CountryZonesFinder.java",
+        "luni/src/main/java/libcore/timezone/TimeZoneDataFiles.java",
+        "luni/src/main/java/libcore/timezone/TimeZoneFinder.java",
+        "luni/src/main/java/libcore/timezone/TzDataSetVersion.java",
+        "luni/src/main/java/libcore/timezone/ZoneInfoDB.java",
+        "luni/src/main/java/libcore/util/ArrayUtils.java",
+        "luni/src/main/java/libcore/util/BasicLruCache.java",
+        "luni/src/main/java/libcore/util/CoreLibraryDebug.java",
+        "luni/src/main/java/libcore/util/DebugInfo.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/NonNull.java",
+        "luni/src/main/java/libcore/util/Nullable.java",
+        "luni/src/main/java/libcore/util/SneakyThrow.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",
         "json/src/main/java/org/json/JSON.java",
         "json/src/main/java/org/json/JSONArray.java",
         "json/src/main/java/org/json/JSONException.java",
@@ -245,43 +293,22 @@ filegroup {
 
 filegroup {
     name: "non_openjdk_java_files",
-    export_to_make_var: "non_openjdk_java_files",
     srcs: [
-        "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/ICU.java",
-        "luni/src/main/java/libcore/icu/LocaleData.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/internal/Java9LanguageFeatures.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/IoUtils.java",
-        "luni/src/main/java/libcore/io/Libcore.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/Os.java",
-        "luni/src/main/java/libcore/io/SizeOf.java",
-        "luni/src/main/java/libcore/io/Streams.java",
         "luni/src/main/java/libcore/math/MathUtils.java",
-        "luni/src/main/java/libcore/net/MimeUtils.java",
-        "luni/src/main/java/libcore/net/NetworkSecurityPolicy.java",
-        "luni/src/main/java/libcore/net/UriCodec.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",
@@ -298,30 +325,11 @@ filegroup {
         "luni/src/main/java/libcore/reflect/Types.java",
         "luni/src/main/java/libcore/reflect/WildcardTypeImpl.java",
         "luni/src/main/java/libcore/util/CharsetUtils.java",
-        "luni/src/main/java/libcore/util/EmptyArray.java",
-        "luni/src/main/java/libcore/util/BasicLruCache.java",
         "luni/src/main/java/libcore/util/CollectionUtils.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/NativeAllocationRegistry.java",
         "luni/src/main/java/libcore/util/NonNull.java",
         "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/RecoverySystem.java",
-        "luni/src/main/java/libcore/util/SneakyThrow.java",
-        "luni/src/main/java/libcore/util/TimeZoneDataFiles.java",
-        "luni/src/main/java/libcore/util/TimeZoneFinder.java",
-        "luni/src/main/java/libcore/util/ZoneInfo.java",
-        "luni/src/main/java/libcore/util/ZoneInfoDB.java",
-        "luni/src/main/java/libcore/util/HexEncoding.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/luni/internal/util/TimezoneGetter.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",
@@ -352,8 +360,19 @@ filegroup {
         "luni/src/main/java/org/apache/harmony/xml/parsers/SAXParserImpl.java",
         "libart/src/main/java/java/lang/CaseMapper.java",
         "libart/src/main/java/java/lang/StringFactory.java",
-        "xml/src/main/java/org/kxml2/io/KXmlParser.java",
-        "xml/src/main/java/org/kxml2/io/KXmlSerializer.java",
+        "xml/src/main/java/com/android/org/kxml2/io/KXmlParser.java",
+        "xml/src/main/java/com/android/org/kxml2/io/KXmlSerializer.java",
         ":non_openjdk_javadoc_files",
     ],
 }
+
+// timezone-related source that is also used in host tests / tools and its
+// dependencies.
+filegroup {
+    name: "timezone_host_files",
+    srcs: [
+        "luni/src/main/java/libcore/api/CorePlatformApi.java",
+        "luni/src/main/java/libcore/api/IntraCoreApi.java",
+        "luni/src/main/java/libcore/timezone/TzDataSetVersion.java",
+    ],
+}