commit 42ce465e83ca5fa90e0163a7e2758eeb06a8aa61
author Alex Klyubin <klyubin@google.com> Mon Aug 14 15:54:01 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 14 15:54:01 2017 +0000
tree 71627cfe186c74eb99283fa66031d5a5cecb33b1
parent 5ae643457557e35985a3121fa290bd378e6ba56d
parent 4012e648eab5bfd2d401f2a58977d2e88dcdb884

Merge "Revert "Let signapk access internal APIs under OpenJDK 9 toolchain""

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 023410c..2136eaf 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2701,14 +2701,10 @@
 $(call sign-package-arg,$@)
 endef
 
-# signapk uses internal APIs from sun.security.{pkcs,x509}; see http://b/37137869
 # $(1): the package file we are signing.
 define sign-package-arg
 $(hide) mv $(1) $(1).unsigned
-$(hide) $(JAVA) -Djava.library.path=$(SIGNAPK_JNI_LIBRARY_PATH) \
-    $(if $(EXPERIMENTAL_USE_OPENJDK9),--add-exports java.base/sun.security.pkcs=ALL-UNNAMED,) \
-    $(if $(EXPERIMENTAL_USE_OPENJDK9),--add-exports java.base/sun.security.x509=ALL-UNNAMED,) \
-    -jar $(SIGNAPK_JAR) \
+$(hide) $(JAVA) -Djava.library.path=$(SIGNAPK_JNI_LIBRARY_PATH) -jar $(SIGNAPK_JAR) \
     $(PRIVATE_CERTIFICATE) $(PRIVATE_PRIVATE_KEY) \
     $(PRIVATE_ADDITIONAL_CERTIFICATES) $(1).unsigned $(1).signed
 $(hide) mv $(1).signed $(1)