commit 8191dfb49e8c8141726f04508f24f4c0fed9ed79
author Alex Klyubin <klyubin@google.com> Mon Aug 14 16:01:33 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Aug 14 16:01:33 2017 +0000
tree 802ced459fb261f19b708cc9c293d10a1b68bddb
parent 3e55981366a67b0abeff3662133c4bf065dc5f47
parent 42ce465e83ca5fa90e0163a7e2758eeb06a8aa61

Merge "Revert "Let signapk access internal APIs under OpenJDK 9 toolchain""
am: 42ce465e83

Change-Id: I9ac004ecfcb36b0cc947e1c6c820142771f6361b

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 2125dbb..02fe82a 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2709,14 +2709,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)