diff options
Diffstat (limited to 'openjdk_java_files.bp')
| -rw-r--r-- | openjdk_java_files.bp | 46 |
1 files changed, 36 insertions, 10 deletions
diff --git a/openjdk_java_files.bp b/openjdk_java_files.bp index c1f29eaf7c..7ba860c757 100644 --- a/openjdk_java_files.bp +++ b/openjdk_java_files.bp @@ -950,6 +950,7 @@ filegroup { "ojluni/src/main/java/java/util/concurrent/ExecutorCompletionService.java", "ojluni/src/main/java/java/util/concurrent/ExecutorService.java", "ojluni/src/main/java/java/util/concurrent/Executors.java", + "ojluni/src/main/java/java/util/concurrent/Flow.java", "ojluni/src/main/java/java/util/concurrent/ForkJoinPool.java", "ojluni/src/main/java/java/util/concurrent/ForkJoinTask.java", "ojluni/src/main/java/java/util/concurrent/ForkJoinWorkerThread.java", @@ -1345,6 +1346,7 @@ filegroup { "ojluni/src/main/java/javax/sql/StatementEventListener.java", "ojluni/src/main/java/sun/reflect/CallerSensitive.java", ], + path: "ojluni/src/main/java", } // Stubs needed to satisfy javac's dependencies when compiling lambda code. These are @@ -1358,11 +1360,15 @@ filegroup { // any of these classes. filegroup { name: "openjdk_lambda_stub_files", + visibility: [ + "//libcore:__subpackages__", + ], srcs: [ "ojluni/src/lambda/java/java/lang/invoke/LambdaMetafactory.java", "ojluni/src/lambda/java/java/lang/invoke/SerializedLambda.java", ], } + filegroup { name: "openjdk_lambda_duplicate_stub_files", srcs: [ @@ -1374,6 +1380,21 @@ filegroup { ], } +// Stubs needed to satisfy javac when compiling source code that contains +// @Generated annotations, which are produced by some code generation tools. +// TODO: Remove this source file, this target, and all its dependencies, if +// the code generation tools (notably dagger) can be fixed. +// See http://b/123891440. +filegroup { + name: "openjdk_generated_annotation_stub_files", + visibility: [ + "//libcore:__subpackages__", + ], + srcs: [ + "ojluni/src/generated-annotation/java/javax/annotation/processing/Generated.java", + ], +} + // Classes which are exposed in the intra-core or core-platform APIs but not in // the public APIs. Unless they are annotated, these classes and all their // members will be exposed in all such APIs. To avoid patching the main ojluni @@ -1414,6 +1435,8 @@ filegroup { "ojluni/src/main/java/java/beans/ChangeListenerMap.java", "ojluni/src/main/java/java/time/zone/IcuZoneRulesProvider.java", "ojluni/src/main/java/java/time/zone/ZoneRulesProvider.java", + "ojluni/src/main/java/java/util/ImmutableCollections.java", + "ojluni/src/main/java/java/util/KeyValueHolder.java", "ojluni/src/main/java/java/util/JapaneseImperialCalendar.java", "ojluni/src/main/java/sun/misc/FDBigInteger.java", "ojluni/src/main/java/sun/misc/FloatingDecimal.java", @@ -1421,6 +1444,8 @@ filegroup { "ojluni/src/main/java/jdk/net/NetworkPermission.java", "ojluni/src/main/java/jdk/net/SocketFlow.java", "ojluni/src/main/java/jdk/net/Sockets.java", + "ojluni/src/main/java/jdk/internal/vm/annotation/Stable.java", + "ojluni/src/main/java/jdk/internal/util/Preconditions.java", "ojluni/src/main/java/sun/invoke/util/BytecodeDescriptor.java", "ojluni/src/main/java/sun/invoke/util/Wrapper.java", "ojluni/src/main/java/sun/invoke/util/VerifyAccess.java", @@ -1431,7 +1456,6 @@ filegroup { "ojluni/src/main/java/sun/misc/CEStreamExhausted.java", "ojluni/src/main/java/sun/misc/CharacterDecoder.java", "ojluni/src/main/java/sun/misc/CharacterEncoder.java", - "ojluni/src/main/java/sun/misc/Cleaner.java", "ojluni/src/main/java/sun/misc/CompoundEnumeration.java", "ojluni/src/main/java/sun/misc/DoubleConsts.java", "ojluni/src/main/java/sun/misc/FileURLMapper.java", @@ -1511,7 +1535,6 @@ filegroup { "ojluni/src/main/java/sun/nio/ch/DatagramSocketAdaptor.java", "ojluni/src/main/java/sun/nio/ch/DefaultAsynchronousChannelProvider.java", "ojluni/src/main/java/sun/nio/ch/DefaultSelectorProvider.java", - "ojluni/src/main/java/sun/nio/ch/DirectBuffer.java", "ojluni/src/main/java/sun/nio/ch/EPoll.java", "ojluni/src/main/java/sun/nio/ch/EPollPort.java", "ojluni/src/main/java/sun/nio/ch/ExtendedSocketOption.java", @@ -1621,13 +1644,10 @@ filegroup { "ojluni/src/main/java/sun/security/jca/JCAUtil.java", "ojluni/src/main/java/sun/security/jca/ProviderConfig.java", "ojluni/src/main/java/sun/security/jca/ProviderList.java", - "ojluni/src/main/java/sun/security/jca/Providers.java", "ojluni/src/main/java/sun/security/jca/ServiceId.java", - "ojluni/src/main/java/sun/security/pkcs/PKCS7.java", "ojluni/src/main/java/sun/security/pkcs/PKCS8Key.java", "ojluni/src/main/java/sun/security/pkcs/PKCS9Attribute.java", "ojluni/src/main/java/sun/security/pkcs/PKCS9Attributes.java", - "ojluni/src/main/java/sun/security/pkcs/SignerInfo.java", "ojluni/src/main/java/sun/security/pkcs/SigningCertificateInfo.java", "ojluni/src/main/java/sun/security/provider/CertPathProvider.java", "ojluni/src/main/java/sun/security/provider/certpath/AdaptableX509CertSelector.java", @@ -1793,11 +1813,15 @@ filegroup { // All classes, whether exposed in any API or not. filegroup { name: "openjdk_java_files", + visibility: [ + "//frameworks/base", + ], srcs: [ ":openjdk_javadoc_files", ":openjdk_mmodule_extra_files", ":openjdk_internal_files", ":openjdk_lambda_stub_files", + ":openjdk_generated_annotation_stub_files", ], } @@ -1814,8 +1838,9 @@ droidstubs { name: "openjdk-sdk-stubs-no-javadoc", srcs: [":openjdk_javadoc_files"], installable: false, - no_framework_libs: true, - args: "--exclude-documentation-from-stubs" + sdk_version: "none", + system_modules: "none", + args: "--exclude-documentation-from-stubs", } // Generates stub files for the classes exposed in the intra-core or @@ -1829,8 +1854,9 @@ droidstubs { ":openjdk_mmodule_extra_files", ], installable: false, - no_framework_libs: true, - args: "--exclude-documentation-from-stubs " - + "--hide-annotation libcore.api.Hide ", + sdk_version: "none", + system_modules: "none", + args: "--exclude-documentation-from-stubs " + + "--hide-annotation libcore.api.Hide ", merge_inclusion_annotations_dirs: ["ojluni-annotated-mmodule-stubs"], } |