diff options
| author | Alex Klyubin <klyubin@google.com> | 2017-06-30 09:23:42 -0700 |
|---|---|---|
| committer | Alex Klyubin <klyubin@google.com> | 2017-08-11 11:15:54 -0700 |
| commit | 4012e648eab5bfd2d401f2a58977d2e88dcdb884 (patch) | |
| tree | 71627cfe186c74eb99283fa66031d5a5cecb33b1 | |
| parent | 5ae643457557e35985a3121fa290bd378e6ba56d (diff) | |
| download | build-4012e648eab5bfd2d401f2a58977d2e88dcdb884.tar.gz | |
Revert "Let signapk access internal APIs under OpenJDK 9 toolchain"
This reverts commit 9cc3c76abd9c8fa159616883e06526d56b5136e5 which
added command-line parameters to the invocation of SignApk to permit
it to access sun.** classes which are not accessible by default in
Java 9. This hack is no longer needed because SignApk no longer needs
this access because of tools/apksig commit
b40d3e4821bc9cb094b0ff13153340e3a0da1b3f which switched APK JAR
signature generation logic away from directly using sun.** classes.
Test: find out -name CtsPkgInstallTinyApp* | xargs rm -Rf
mmma -j74 cts/hostsidetests/appsecurity/test-apps/tinyapp
Test: find out -name CtsPkgInstallTinyApp* | xargs rm -Rf
EXPERIMENTAL_USE_OPENJDK9=target1.8 \
OVERRIDE_ANDROID_JAVA_HOME=<path to Java 9 SDK> \
PATH=${OVERRIDE_ANDROID_JAVA_HOME}/bin:${PATH} \
mmma -j74 cts/hostsidetests/appsecurity/test-apps/tinyapp
Bug: 37137869
Change-Id: I389c366f8a5bed56c496293bc871458adbedb0e8
| -rw-r--r-- | core/definitions.mk | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/core/definitions.mk b/core/definitions.mk index 023410c514..2136eaf968 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -2701,14 +2701,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) |