diff options
| author | Jaewoong Jung <jungjw@google.com> | 2020-06-25 16:06:21 -0700 |
|---|---|---|
| committer | Jaewoong Jung <jungjw@google.com> | 2020-06-25 16:06:21 -0700 |
| commit | 077891d190d7dd2e612ca1d346cfc248a3424ce2 (patch) | |
| tree | b365e559bb6ae32495f3dc95cf7eabf25d997fba | |
| parent | c35ea185b033b5339ccd115e1e10c18561823950 (diff) | |
| download | build_make-077891d190d7dd2e612ca1d346cfc248a3424ce2.tar.gz build_make-077891d190d7dd2e612ca1d346cfc248a3424ce2.tar.bz2 build_make-077891d190d7dd2e612ca1d346cfc248a3424ce2.zip | |
Mark android_app_set modules PRESIGNED.
Test: m apkcerts-list
Fixes: 159921591
Change-Id: Ie83a05be0d71280644843eddffdbea6bcb429c74
| -rw-r--r-- | core/soong_android_app_set.mk | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/core/soong_android_app_set.mk b/core/soong_android_app_set.mk index 5ed9b2c29b..eb8e5e7550 100644 --- a/core/soong_android_app_set.mk +++ b/core/soong_android_app_set.mk @@ -31,4 +31,17 @@ LOCAL_POST_INSTALL_CMD := unzip -qo -j -d $(dir $(LOCAL_INSTALLED_MODULE)) \ $(LOCAL_INSTALLED_MODULE): PRIVATE_POST_INSTALL_CMD := $(LOCAL_POST_INSTALL_CMD) PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES)) +# android_app_set modules are always presigned +PACKAGES.$(LOCAL_MODULE).CERTIFICATE := PRESIGNED +PACKAGES := $(PACKAGES) $(LOCAL_MODULE) + +ifneq ($(LOCAL_MODULE_STEM),) + PACKAGES.$(LOCAL_MODULE).STEM := $(LOCAL_MODULE_STEM) +else + PACKAGES.$(LOCAL_MODULE).STEM := $(LOCAL_MODULE) +endif + +# Set a actual_partition_tag (calculated in base_rules.mk) for the package. +PACKAGES.$(LOCAL_MODULE).PARTITION := $(actual_partition_tag) + SOONG_ALREADY_CONV += $(LOCAL_MODULE) |