Merge "Make apks depend on their certificates" am: f0a465c2cb

am: f562875d0c

* commit 'f562875d0c232b91be9a0931d30c31b1bbb98c45':
  Make apks depend on their certificates

Change-Id: I28f5f91a6265201136cdf83c18c7ada359bb4d33

diff --cc core/dpi_specific_apk.mk
Simple merge

diff --cc core/package_internal.mk
index 8d9f306,e0df325..9545823
--- 1/core/package_internal.mk
--- 2/core/package_internal.mk
+++ b/core/package_internal.mk
@@@ -463,10 -378,11 +464,10 @@@ $(LOCAL_BUILT_MODULE): PRIVATE_CERTIFIC
  PACKAGES.$(LOCAL_PACKAGE_NAME).PRIVATE_KEY := $(private_key)
  PACKAGES.$(LOCAL_PACKAGE_NAME).CERTIFICATE := $(certificate)
  
- $(LOCAL_BUILT_MODULE): PRIVATE_ADDITIONAL_CERTIFICATES := $(foreach c,\
-     $(LOCAL_ADDITIONAL_CERTIFICATES), $(c).x509.pem $(c).pk8)
+ $(LOCAL_BUILT_MODULE): $(additional_certificates)
+ $(LOCAL_BUILT_MODULE): PRIVATE_ADDITIONAL_CERTIFICATES := $(additional_certificates)
  
  # Define the rule to build the actual package.
 -$(LOCAL_BUILT_MODULE): $(AAPT)
  # PRIVATE_JNI_SHARED_LIBRARIES is a list of <abi>:<path_of_built_lib>.
  $(LOCAL_BUILT_MODULE): PRIVATE_JNI_SHARED_LIBRARIES := $(jni_shared_libraries_with_abis)
  # PRIVATE_JNI_SHARED_LIBRARIES_ABI is a list of ABI names.

diff --cc core/prebuilt_internal.mk
Simple merge