diff options
| author | Jiyong Park <jiyong@google.com> | 2018-03-06 23:17:41 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2018-03-07 02:22:36 +0900 |
| commit | ed6d68ed9747c96d54d6773af40060e780443b1a (patch) | |
| tree | b61560bf074f80ddfc201ced730052175b1bfc1a /Android.bp | |
| parent | edf941983f13e934c33eabbe6d1cf4fe03d69b89 (diff) | |
| download | platform_external_protobuf-ed6d68ed9747c96d54d6773af40060e780443b1a.tar.gz platform_external_protobuf-ed6d68ed9747c96d54d6773af40060e780443b1a.tar.bz2 platform_external_protobuf-ed6d68ed9747c96d54d6773af40060e780443b1a.zip | |
Don't force libcore_private.stubs to be built with java 1.7
We no longer need to build libcore_private.stubs with java 1.7, because
the library is only built for target and not for host, where it
conflicts with the module jdk.unsupported.
Bug: 74211600
Test: m -j libprotobuf-java-lite is successful. both host and target
variant of the lib is generated.
Test: EXPERIMENTAL_USE_OPENJDK9=true m -j libprotobuf-java-lite is also
successful.
Change-Id: I61a49d537ee6abad29e5661944ffc612a94465b8
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp index b5aa827af..84b10229b 100644 --- a/Android.bp +++ b/Android.bp @@ -550,7 +550,11 @@ java_library_static { "java/core/src/main/java/com/google/protobuf/WireFormat.java", ], - libs: ["libcore_private.stubs"], + target: { + android: { + libs: ["libcore_private.stubs"], + }, + }, java_version: "1.7", } @@ -588,11 +592,7 @@ java_library_host { // ======================================================= java_library { name: "libcore_private.stubs", - host_supported: true, srcs: ["java/core/src/stubs/**/*.java"], sdk_version: "core_current", - // This library can't be build with JDK9 since the same package (sun.misc) already - // exist in jdk.unsupported module. Using the same Java version as libprotobuf-java-lite. - java_version: "1.7", installable: false, } |