openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Stop using build/target -> build/make/target symlink" am: e3ef041244 

am: db1e6e9cbc

Change-Id: I3900e2c73b2379a9b4d36576f3e9d02bd4dd24b7
This commit is contained in:
Dan Willemsen 2019-04-10 13:46:36 -07:00 committed by android-build-merger
parent 8dddeb057f db1e6e9cbc
commit b801fa66ad
15 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/Makefile
View File

@ -325,7 +325,7 @@ endif
# non-default dev keys (usually private keys from a vendor directory). # non-default dev keys (usually private keys from a vendor directory).
# Both of these tags will be removed and replaced with "release-keys" # Both of these tags will be removed and replaced with "release-keys"
# when the target-files is signed in a post-build step. # when the target-files is signed in a post-build step.
ifeq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),build/target/product/security/testkey) ifeq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),build/make/target/product/security/testkey)
BUILD_KEYS := test-keys BUILD_KEYS := test-keys
else else
BUILD_KEYS := dev-keys BUILD_KEYS := dev-keys
@ -3585,7 +3585,7 @@ $(BUILT_OTATOOLS_PACKAGE): zip_root := $(call intermediates-dir-for,PACKAGING,ot
OTATOOLS_DEPS := \ OTATOOLS_DEPS := \
system/extras/ext4_utils/mke2fs.conf \ system/extras/ext4_utils/mke2fs.conf \
$(sort $(shell find build/target/product/security -type f -name "*.x509.pem" -o -name "*.pk8" -o \ $(sort $(shell find build/make/target/product/security -type f -name "*.x509.pem" -o -name "*.pk8" -o \
-name verity_key)) -name verity_key))
ifneq (,$(wildcard device)) ifneq (,$(wildcard device))

4
core/config.mk
View File

@ -105,7 +105,7 @@ ORIGINAL_MAKECMDGOALS := $(MAKECMDGOALS)
UNAME := $(shell uname -sm) UNAME := $(shell uname -sm)
SRC_TARGET_DIR := $(TOPDIR)build/target SRC_TARGET_DIR := $(TOPDIR)build/make/target
# Some specific paths to tools # Some specific paths to tools
SRC_DROIDDOC_DIR := $(TOPDIR)build/make/tools/droiddoc SRC_DROIDDOC_DIR := $(TOPDIR)build/make/tools/droiddoc
@ -762,7 +762,7 @@ endif
ifdef PRODUCT_DEFAULT_DEV_CERTIFICATE ifdef PRODUCT_DEFAULT_DEV_CERTIFICATE
DEFAULT_SYSTEM_DEV_CERTIFICATE := $(PRODUCT_DEFAULT_DEV_CERTIFICATE) DEFAULT_SYSTEM_DEV_CERTIFICATE := $(PRODUCT_DEFAULT_DEV_CERTIFICATE)
else else
DEFAULT_SYSTEM_DEV_CERTIFICATE := build/target/product/security/testkey DEFAULT_SYSTEM_DEV_CERTIFICATE := build/make/target/product/security/testkey
endif endif
.KATI_READONLY := DEFAULT_SYSTEM_DEV_CERTIFICATE .KATI_READONLY := DEFAULT_SYSTEM_DEV_CERTIFICATE

2
target/board/generic_arm64/BoardConfig.mk
View File

@ -67,7 +67,7 @@ BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt:/firmware
# TODO(b/36764215): remove this setting when the generic system image # TODO(b/36764215): remove this setting when the generic system image
# no longer has QCOM-specific directories under /. # no longer has QCOM-specific directories under /.
BOARD_SEPOLICY_DIRS += build/target/board/generic_arm64_ab/sepolicy BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64_ab/sepolicy
# Wifi. # Wifi.
BOARD_WLAN_DEVICE := emulator BOARD_WLAN_DEVICE := emulator

2
target/board/generic_arm64_ab/BoardConfig.mk
View File

@ -36,4 +36,4 @@ BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/verinfo:/firmware/verinfo
# TODO(b/36764215): remove this setting when the generic system image # TODO(b/36764215): remove this setting when the generic system image
# no longer has QCOM-specific directories under /. # no longer has QCOM-specific directories under /.
BOARD_SEPOLICY_DIRS += build/target/board/generic_arm64_ab/sepolicy BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64_ab/sepolicy

2
target/board/generic_arm_ab/BoardConfig.mk
View File

@ -33,4 +33,4 @@ BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/verinfo:/firmware/verinfo
# TODO(b/36764215): remove this setting when the generic system image # TODO(b/36764215): remove this setting when the generic system image
# no longer has QCOM-specific directories under /. # no longer has QCOM-specific directories under /.
BOARD_SEPOLICY_DIRS += build/target/board/generic_arm64_ab/sepolicy BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64_ab/sepolicy

2
target/board/gsi_arm64/BoardConfig.mk
View File

@ -34,4 +34,4 @@ BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt:/firmware
# TODO(b/36764215): remove this setting when the generic system image # TODO(b/36764215): remove this setting when the generic system image
# no longer has QCOM-specific directories under /. # no longer has QCOM-specific directories under /.
BOARD_SEPOLICY_DIRS += build/target/board/generic_arm64_ab/sepolicy BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64_ab/sepolicy

2
target/product/go_defaults.mk
View File

@ -15,7 +15,7 @@
# #
# Inherit common Android Go defaults. # Inherit common Android Go defaults.
$(call inherit-product, build/target/product/go_defaults_common.mk) $(call inherit-product, build/make/target/product/go_defaults_common.mk)
# Add the system properties. # Add the system properties.
TARGET_SYSTEM_PROP += \ TARGET_SYSTEM_PROP += \

2
target/product/go_defaults_512.mk
View File

@ -15,7 +15,7 @@
# #
# Inherit common Android Go defaults. # Inherit common Android Go defaults.
$(call inherit-product, build/target/product/go_defaults_common.mk) $(call inherit-product, build/make/target/product/go_defaults_common.mk)
# Add the system properties. # Add the system properties.
TARGET_SYSTEM_PROP += \ TARGET_SYSTEM_PROP += \

4
target/product/profile_boot_common.mk
View File

@ -19,7 +19,7 @@
# remove classes that are no longer in use. # remove classes that are no longer in use.
# Ideally we would just generate an empty boot.art but we don't have the build # Ideally we would just generate an empty boot.art but we don't have the build
# support to separate the image from the compile code. # support to separate the image from the compile code.
PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION := build/target/product/empty-profile PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION := build/make/target/product/empty-profile
PRODUCT_DEX_PREOPT_BOOT_FLAGS := --count-hotness-in-compiled-code PRODUCT_DEX_PREOPT_BOOT_FLAGS := --count-hotness-in-compiled-code
DEX_PREOPT_DEFAULT := nostripping DEX_PREOPT_DEFAULT := nostripping
@ -28,7 +28,7 @@ DONT_UNCOMPRESS_PRIV_APPS_DEXS := true
# Use an empty preloaded-classes list. # Use an empty preloaded-classes list.
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
build/target/product/empty-preloaded-classes:system/etc/preloaded-classes build/make/target/product/empty-preloaded-classes:system/etc/preloaded-classes
# Boot image property overrides. # Boot image property overrides.
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \

2
target/product/security/README
View File

@ -31,7 +31,7 @@ extracting public keys for embedding
dumpkey.jar is a Java tool that takes an x.509 certificate in PEM format as dumpkey.jar is a Java tool that takes an x.509 certificate in PEM format as
input and prints a C structure to standard output: input and prints a C structure to standard output:
$ java -jar out/host/linux-x86/framework/dumpkey.jar build/target/product/security/testkey.x509.pem $ java -jar out/host/linux-x86/framework/dumpkey.jar build/make/target/product/security/testkey.x509.pem
{64,0xc926ad21,{1795090719,2141396315,950055447,2581568430,4268923165,1920809988,546586521,3498997798,1776797858,3740060814,1805317999,1429410244,129622599,1422441418,1783893377,1222374759,2563319927,323993566,28517732,609753416,1826472888,215237850,4261642700,4049082591,3228462402,774857746,154822455,2497198897,2758199418,3019015328,2794777644,87251430,2534927978,120774784,571297800,3695899472,2479925187,3811625450,3401832990,2394869647,3267246207,950095497,555058928,414729973,1136544882,3044590084,465547824,4058146728,2731796054,1689838846,3890756939,1048029507,895090649,247140249,178744550,3547885223,3165179243,109881576,3944604415,1044303212,3772373029,2985150306,3737520932,3599964420},{3437017481,3784475129,2800224972,3086222688,251333580,2131931323,512774938,325948880,2657486437,2102694287,3820568226,792812816,1026422502,2053275343,2800889200,3113586810,165549746,4273519969,4065247892,1902789247,772932719,3941848426,3652744109,216871947,3164400649,1942378755,3996765851,1055777370,964047799,629391717,2232744317,3910558992,191868569,2758883837,3682816752,2997714732,2702529250,3570700455,3776873832,3924067546,3555689545,2758825434,1323144535,61311905,1997411085,376844204,213777604,4077323584,9135381,1625809335,2804742137,2952293945,1117190829,4237312782,1825108855,3013147971,1111251351,2568837572,1684324211,2520978805,367251975,810756730,2353784344,1175080310}} {64,0xc926ad21,{1795090719,2141396315,950055447,2581568430,4268923165,1920809988,546586521,3498997798,1776797858,3740060814,1805317999,1429410244,129622599,1422441418,1783893377,1222374759,2563319927,323993566,28517732,609753416,1826472888,215237850,4261642700,4049082591,3228462402,774857746,154822455,2497198897,2758199418,3019015328,2794777644,87251430,2534927978,120774784,571297800,3695899472,2479925187,3811625450,3401832990,2394869647,3267246207,950095497,555058928,414729973,1136544882,3044590084,465547824,4058146728,2731796054,1689838846,3890756939,1048029507,895090649,247140249,178744550,3547885223,3165179243,109881576,3944604415,1044303212,3772373029,2985150306,3737520932,3599964420},{3437017481,3784475129,2800224972,3086222688,251333580,2131931323,512774938,325948880,2657486437,2102694287,3820568226,792812816,1026422502,2053275343,2800889200,3113586810,165549746,4273519969,4065247892,1902789247,772932719,3941848426,3652744109,216871947,3164400649,1942378755,3996765851,1055777370,964047799,629391717,2232744317,3910558992,191868569,2758883837,3682816752,2997714732,2702529250,3570700455,3776873832,3924067546,3555689545,2758825434,1323144535,61311905,1997411085,376844204,213777604,4077323584,9135381,1625809335,2804742137,2952293945,1117190829,4237312782,1825108855,3013147971,1111251351,2568837572,1684324211,2520978805,367251975,810756730,2353784344,1175080310}}
This is called by build/make/core/Makefile to incorporate the OTA signing keys This is called by build/make/core/Makefile to incorporate the OTA signing keys

2
target/product/verity.mk
View File

@ -23,7 +23,7 @@ PRODUCT_SUPPORTS_VERITY_FEC := true
# The dev key is used to sign boot and recovery images, and the verity # The dev key is used to sign boot and recovery images, and the verity
# metadata table. Actual product deliverables will be re-signed by hand. # metadata table. Actual product deliverables will be re-signed by hand.
# We expect this file to exist with the suffixes ".x509.pem" and ".pk8". # We expect this file to exist with the suffixes ".x509.pem" and ".pk8".
PRODUCT_VERITY_SIGNING_KEY := build/target/product/security/verity PRODUCT_VERITY_SIGNING_KEY := build/make/target/product/security/verity
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
verity_key verity_key

4
tools/releasetools/ota_from_target_files.py
View File

@ -38,7 +38,7 @@ Common options that apply to both of non-A/B and A/B OTAs
-k (--package_key) <key> -k (--package_key) <key>
Key to use to sign the package (default is the value of Key to use to sign the package (default is the value of
default_system_dev_certificate from the input target-files's default_system_dev_certificate from the input target-files's
META/misc_info.txt, or "build/target/product/security/testkey" if that META/misc_info.txt, or "build/make/target/product/security/testkey" if that
value is not specified). value is not specified).
For incremental OTAs, the default value is based on the source For incremental OTAs, the default value is based on the source
@ -2232,7 +2232,7 @@ def main(argv):
if OPTIONS.package_key is None: if OPTIONS.package_key is None:
OPTIONS.package_key = OPTIONS.info_dict.get( OPTIONS.package_key = OPTIONS.info_dict.get(
"default_system_dev_certificate", "default_system_dev_certificate",
"build/target/product/security/testkey") "build/make/target/product/security/testkey")
# Get signing keys # Get signing keys
OPTIONS.key_passwords = common.GetKeyPasswords([OPTIONS.package_key]) OPTIONS.key_passwords = common.GetKeyPasswords([OPTIONS.package_key])

6
tools/releasetools/sign_target_files_apks.py
View File

@ -56,7 +56,7 @@ Usage: sign_target_files_apks [flags] input_target_files output_target_files
where $devkey is the directory part of the value of where $devkey is the directory part of the value of
default_system_dev_certificate from the input target-files's default_system_dev_certificate from the input target-files's
META/misc_info.txt. (Defaulting to "build/target/product/security" META/misc_info.txt. (Defaulting to "build/make/target/product/security"
if the value is not present in misc_info. if the value is not present in misc_info.
-d and -k options are added to the set of mappings in the order -d and -k options are added to the set of mappings in the order
@ -802,7 +802,7 @@ def ReplaceOtaKeys(input_tf_zip, output_tf_zip, misc_info):
print("for OTA package verification") print("for OTA package verification")
else: else:
devkey = misc_info.get("default_system_dev_certificate", devkey = misc_info.get("default_system_dev_certificate",
"build/target/product/security/testkey") "build/make/target/product/security/testkey")
mapped_devkey = OPTIONS.key_map.get(devkey, devkey) mapped_devkey = OPTIONS.key_map.get(devkey, devkey)
if mapped_devkey != devkey: if mapped_devkey != devkey:
misc_info["default_system_dev_certificate"] = mapped_devkey misc_info["default_system_dev_certificate"] = mapped_devkey
@ -959,7 +959,7 @@ def BuildKeyMap(misc_info, key_mapping_options):
for s, d in key_mapping_options: for s, d in key_mapping_options:
if s is None: # -d option if s is None: # -d option
devkey = misc_info.get("default_system_dev_certificate", devkey = misc_info.get("default_system_dev_certificate",
"build/target/product/security/testkey") "build/make/target/product/security/testkey")
devkeydir = os.path.dirname(devkey) devkeydir = os.path.dirname(devkey)
OPTIONS.key_map.update({ OPTIONS.key_map.update({

6
tools/releasetools/test_common.py
View File

@ -451,14 +451,14 @@ class CommonApkUtilsTest(test_utils.ReleaseToolsTestCase):
'name="RecoveryLocalizer.apk" certificate="certs/devkey.x509.pem"' 'name="RecoveryLocalizer.apk" certificate="certs/devkey.x509.pem"'
' private_key="certs/devkey.pk8"\n' ' private_key="certs/devkey.pk8"\n'
'name="Settings.apk"' 'name="Settings.apk"'
' certificate="build/target/product/security/platform.x509.pem"' ' certificate="build/make/target/product/security/platform.x509.pem"'
' private_key="build/target/product/security/platform.pk8"\n' ' private_key="build/make/target/product/security/platform.pk8"\n'
'name="TV.apk" certificate="PRESIGNED" private_key=""\n' 'name="TV.apk" certificate="PRESIGNED" private_key=""\n'
) )
APKCERTS_CERTMAP1 = { APKCERTS_CERTMAP1 = {
'RecoveryLocalizer.apk' : 'certs/devkey', 'RecoveryLocalizer.apk' : 'certs/devkey',
'Settings.apk' : 'build/target/product/security/platform', 'Settings.apk' : 'build/make/target/product/security/platform',
'TV.apk' : 'PRESIGNED', 'TV.apk' : 'PRESIGNED',
} }

28
tools/releasetools/test_sign_target_files_apks.py
View File

@ -34,8 +34,8 @@ class SignTargetFilesApksTest(test_utils.ReleaseToolsTestCase):
</policy>""" </policy>"""
# pylint: disable=line-too-long # pylint: disable=line-too-long
APEX_KEYS_TXT = """name="apex.apexd_test.apex" public_key="system/apex/apexd/apexd_testdata/com.android.apex.test_package.avbpubkey" private_key="system/apex/apexd/apexd_testdata/com.android.apex.test_package.pem" container_certificate="build/target/product/security/testkey.x509.pem" container_private_key="build/target/product/security/testkey.pk8" APEX_KEYS_TXT = """name="apex.apexd_test.apex" public_key="system/apex/apexd/apexd_testdata/com.android.apex.test_package.avbpubkey" private_key="system/apex/apexd/apexd_testdata/com.android.apex.test_package.pem" container_certificate="build/make/target/product/security/testkey.x509.pem" container_private_key="build/make/target/product/security/testkey.pk8"
name="apex.apexd_test_different_app.apex" public_key="system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.avbpubkey" private_key="system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.pem" container_certificate="build/target/product/security/testkey.x509.pem" container_private_key="build/target/product/security/testkey.pk8" name="apex.apexd_test_different_app.apex" public_key="system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.avbpubkey" private_key="system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.pem" container_certificate="build/make/target/product/security/testkey.x509.pem" container_private_key="build/make/target/product/security/testkey.pk8"
""" """
def setUp(self): def setUp(self):
@ -395,10 +395,10 @@ name="apex.apexd_test_different_app.apex" public_key="system/apex/apexd/apexd_te
self.assertEqual({ self.assertEqual({
'apex.apexd_test.apex': ( 'apex.apexd_test.apex': (
'system/apex/apexd/apexd_testdata/com.android.apex.test_package.pem', 'system/apex/apexd/apexd_testdata/com.android.apex.test_package.pem',
'build/target/product/security/testkey'), 'build/make/target/product/security/testkey'),
'apex.apexd_test_different_app.apex': ( 'apex.apexd_test_different_app.apex': (
'system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.pem', 'system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.pem',
'build/target/product/security/testkey'), 'build/make/target/product/security/testkey'),
}, keys_info) }, keys_info)
def test_ReadApexKeysInfo_mismatchingContainerKeys(self): def test_ReadApexKeysInfo_mismatchingContainerKeys(self):
@ -407,8 +407,8 @@ name="apex.apexd_test_different_app.apex" public_key="system/apex/apexd/apexd_te
'name="apex.apexd_test_different_app2.apex" ' 'name="apex.apexd_test_different_app2.apex" '
'public_key="system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.avbpubkey" ' 'public_key="system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.avbpubkey" '
'private_key="system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.pem" ' 'private_key="system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.pem" '
'container_certificate="build/target/product/security/testkey.x509.pem" ' 'container_certificate="build/make/target/product/security/testkey.x509.pem" '
'container_private_key="build/target/product/security/testkey2.pk8"') 'container_private_key="build/make/target/product/security/testkey2.pk8"')
target_files = common.MakeTempFile(suffix='.zip') target_files = common.MakeTempFile(suffix='.zip')
with zipfile.ZipFile(target_files, 'w') as target_files_zip: with zipfile.ZipFile(target_files, 'w') as target_files_zip:
target_files_zip.writestr('META/apexkeys.txt', apex_keys) target_files_zip.writestr('META/apexkeys.txt', apex_keys)
@ -421,8 +421,8 @@ name="apex.apexd_test_different_app.apex" public_key="system/apex/apexd/apexd_te
apex_keys = self.APEX_KEYS_TXT + ( apex_keys = self.APEX_KEYS_TXT + (
'name="apex.apexd_test_different_app2.apex" ' 'name="apex.apexd_test_different_app2.apex" '
'public_key="system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.avbpubkey" ' 'public_key="system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.avbpubkey" '
'container_certificate="build/target/product/security/testkey.x509.pem" ' 'container_certificate="build/make/target/product/security/testkey.x509.pem" '
'container_private_key="build/target/product/security/testkey.pk8"') 'container_private_key="build/make/target/product/security/testkey.pk8"')
target_files = common.MakeTempFile(suffix='.zip') target_files = common.MakeTempFile(suffix='.zip')
with zipfile.ZipFile(target_files, 'w') as target_files_zip: with zipfile.ZipFile(target_files, 'w') as target_files_zip:
target_files_zip.writestr('META/apexkeys.txt', apex_keys) target_files_zip.writestr('META/apexkeys.txt', apex_keys)
@ -433,10 +433,10 @@ name="apex.apexd_test_different_app.apex" public_key="system/apex/apexd/apexd_te
self.assertEqual({ self.assertEqual({
'apex.apexd_test.apex': ( 'apex.apexd_test.apex': (
'system/apex/apexd/apexd_testdata/com.android.apex.test_package.pem', 'system/apex/apexd/apexd_testdata/com.android.apex.test_package.pem',
'build/target/product/security/testkey'), 'build/make/target/product/security/testkey'),
'apex.apexd_test_different_app.apex': ( 'apex.apexd_test_different_app.apex': (
'system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.pem', 'system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.pem',
'build/target/product/security/testkey'), 'build/make/target/product/security/testkey'),
}, keys_info) }, keys_info)
def test_ReadApexKeysInfo_missingPayloadPublicKey(self): def test_ReadApexKeysInfo_missingPayloadPublicKey(self):
@ -444,8 +444,8 @@ name="apex.apexd_test_different_app.apex" public_key="system/apex/apexd/apexd_te
apex_keys = self.APEX_KEYS_TXT + ( apex_keys = self.APEX_KEYS_TXT + (
'name="apex.apexd_test_different_app2.apex" ' 'name="apex.apexd_test_different_app2.apex" '
'private_key="system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.pem" ' 'private_key="system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.pem" '
'container_certificate="build/target/product/security/testkey.x509.pem" ' 'container_certificate="build/make/target/product/security/testkey.x509.pem" '
'container_private_key="build/target/product/security/testkey.pk8"') 'container_private_key="build/make/target/product/security/testkey.pk8"')
target_files = common.MakeTempFile(suffix='.zip') target_files = common.MakeTempFile(suffix='.zip')
with zipfile.ZipFile(target_files, 'w') as target_files_zip: with zipfile.ZipFile(target_files, 'w') as target_files_zip:
target_files_zip.writestr('META/apexkeys.txt', apex_keys) target_files_zip.writestr('META/apexkeys.txt', apex_keys)
@ -456,8 +456,8 @@ name="apex.apexd_test_different_app.apex" public_key="system/apex/apexd/apexd_te
self.assertEqual({ self.assertEqual({
'apex.apexd_test.apex': ( 'apex.apexd_test.apex': (
'system/apex/apexd/apexd_testdata/com.android.apex.test_package.pem', 'system/apex/apexd/apexd_testdata/com.android.apex.test_package.pem',
'build/target/product/security/testkey'), 'build/make/target/product/security/testkey'),
'apex.apexd_test_different_app.apex': ( 'apex.apexd_test_different_app.apex': (
'system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.pem', 'system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.pem',
'build/target/product/security/testkey'), 'build/make/target/product/security/testkey'),
}, keys_info) }, keys_info)