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

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

Merge "Make signapk use Conscrypt." 

am: 7884a637

* commit '7884a637':
  Make signapk use Conscrypt.
parents a3fbb3b0 7884a637

core/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -1400,7 +1400,8 @@ OTATOOLS += \ 
  $(HOST_LIBRARY_PATH)/libext2_e2p-host$(HOST_SHLIB_SUFFIX) \

  $(HOST_LIBRARY_PATH)/libext2_profile-host$(HOST_SHLIB_SUFFIX) \

  $(HOST_LIBRARY_PATH)/libext2_quota-host$(HOST_SHLIB_SUFFIX) \

  $(HOST_LIBRARY_PATH)/libext2_uuid-host$(HOST_SHLIB_SUFFIX)

  $(HOST_LIBRARY_PATH)/libext2_uuid-host$(HOST_SHLIB_SUFFIX) \

  $(HOST_LIBRARY_PATH)/libconscrypt_openjdk_jni$(HOST_SHLIB_SUFFIX)



.PHONY: otatools

otatools: $(OTATOOLS)

core/config.mk

+3 −0
Original line number Diff line number Diff line
@@ -453,6 +453,7 @@ AIDL := $(HOST_OUT_EXECUTABLES)/aidl 
AAPT := $(HOST_OUT_EXECUTABLES)/aapt

ZIPALIGN := $(HOST_OUT_EXECUTABLES)/zipalign

SIGNAPK_JAR := $(HOST_OUT_JAVA_LIBRARIES)/signapk$(COMMON_JAVA_PACKAGE_SUFFIX)

SIGNAPK_JNI_LIBRARY_PATH := $(HOST_OUT_SHARED_LIBRARIES)

LLVM_RS_CC := $(HOST_OUT_EXECUTABLES)/llvm-rs-cc

BCC_COMPAT := $(HOST_OUT_EXECUTABLES)/bcc_compat
@@ -469,6 +470,8 @@ AIDL := $(prebuilt_sdk_tools_bin)/aidl 
AAPT := $(prebuilt_sdk_tools_bin)/aapt

ZIPALIGN := $(prebuilt_sdk_tools_bin)/zipalign

SIGNAPK_JAR := $(prebuilt_sdk_tools)/lib/signapk$(COMMON_JAVA_PACKAGE_SUFFIX)

# Use 64-bit libraries unconditionally because 32-bit JVMs are no longer supported

SIGNAPK_JNI_LIBRARY_PATH := $(prebuilt_sdk_tools)/$(HOST_OS)/lib64



DX := $(prebuilt_sdk_tools)/dx

MAINDEXCLASSES := $(prebuilt_sdk_tools)/mainDexClasses

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -2165,7 +2165,7 @@ endef 
#

define sign-package

$(hide) mv $@ $@.unsigned

$(hide) java -jar $(SIGNAPK_JAR) \

$(hide) java -Djava.library.path=$(SIGNAPK_JNI_LIBRARY_PATH) -jar $(SIGNAPK_JAR) \

    $(PRIVATE_CERTIFICATE) $(PRIVATE_PRIVATE_KEY) \

    $(PRIVATE_ADDITIONAL_CERTIFICATES) $@.unsigned $@.signed

$(hide) mv $@.signed $@

tools/releasetools/common.py

+11 −2
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ class Options(object): 


    self.search_path = platform_search_path.get(sys.platform, None)

    self.signapk_path = "framework/signapk.jar"  # Relative to search_path

    self.signapk_shared_library_path = "lib64"   # Relative to search_path

    self.extra_signapk_args = []

    self.java_path = "java"  # Use the one on the path by default.

    self.java_args = "-Xmx2048m" # JVM Args
@@ -598,7 +599,12 @@ def SignFile(input_name, output_name, key, password, whole_file=False): 
  zip file.

  """



  cmd = [OPTIONS.java_path, OPTIONS.java_args, "-jar",

  java_library_path = os.path.join(

      OPTIONS.search_path, OPTIONS.signapk_shared_library_path)



  cmd = [OPTIONS.java_path, OPTIONS.java_args,

         "-Djava.library.path=" + java_library_path,

         "-jar",

         os.path.join(OPTIONS.search_path, OPTIONS.signapk_path)]

  cmd.extend(OPTIONS.extra_signapk_args)

  if whole_file:
@@ -718,7 +724,8 @@ def ParseOptions(argv, 
  try:

    opts, args = getopt.getopt(

        argv, "hvp:s:x:" + extra_opts,

        ["help", "verbose", "path=", "signapk_path=", "extra_signapk_args=",

        ["help", "verbose", "path=", "signapk_path=",

         "signapk_shared_library_path=", "extra_signapk_args=",

         "java_path=", "java_args=", "public_key_suffix=",

         "private_key_suffix=", "boot_signer_path=", "boot_signer_args=",

         "verity_signer_path=", "verity_signer_args=", "device_specific=",
@@ -739,6 +746,8 @@ def ParseOptions(argv, 
      OPTIONS.search_path = a

    elif o in ("--signapk_path",):

      OPTIONS.signapk_path = a

    elif o in ("--signapk_shared_library_path",):

      OPTIONS.signapk_shared_library_path = a

    elif o in ("--extra_signapk_args",):

      OPTIONS.extra_signapk_args = shlex.split(a)

    elif o in ("--java_path",):

tools/signapk/Android.mk

+9 −4
Original line number Diff line number Diff line
@@ -21,11 +21,16 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := signapk

LOCAL_SRC_FILES := SignApk.java

LOCAL_JAR_MANIFEST := SignApk.mf

LOCAL_STATIC_JAVA_LIBRARIES := bouncycastle-host bouncycastle-bcpkix-host

LOCAL_STATIC_JAVA_LIBRARIES := bouncycastle-host bouncycastle-bcpkix-host conscrypt-host

LOCAL_REQUIRED_MODULES := libconscrypt_openjdk_jni

include $(BUILD_HOST_JAVA_LIBRARY)



ifeq ($(TARGET_BUILD_APPS),)

# The post-build signing tools need signapk.jar, but we don't

# need this if we're just doing unbundled apps.

$(call dist-for-goals,droidcore,$(LOCAL_INSTALLED_MODULE))

# The post-build signing tools need signapk.jar and its shared libraries,

# but we don't need this if we're just doing unbundled apps.

my_dist_files := $(LOCAL_INSTALLED_MODULE) \

    $(HOST_OUT_SHARED_LIBRARIES)/libconscrypt_openjdk_jni$(HOST_SHLIB_SUFFIX)



$(call dist-for-goals,droidcore,$(my_dist_files))

my_dist_files :=

endif