Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d98708d7 authored by Alex Klyubin's avatar Alex Klyubin Committed by android-build-merger
Browse files

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

am: 8191dfb4

Change-Id: If7ae27d99d553074e06bf8bff724a4f126ea3968
parents da8798f2 8191dfb4

core/definitions.mk

+1 −5
Original line number Diff line number Diff line
@@ -2709,14 +2709,10 @@ define sign-package 
$(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)