commit 1f7ac2d5be1a1b7807bc659d569746ba49182066
author Svetoslav Ganov <svetoslavganov@google.com> Sun May 03 08:13:34 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sun May 03 08:13:34 2020 +0000
tree cb390d27b8a6863ce1b7eca58f55a12006669df9
parent 679c2cb2f842fbe431783a41aee6bde86795a67d
parent 101405358211d7a2c841667a01724dd75023a433

Merge "Updating platform SDK version for R" into rvc-dev-plus-aosp

core/app_prebuilt_internal.mk

diff --git a/core/app_prebuilt_internal.mk b/core/app_prebuilt_internal.mk
index 61e13e9..ab574b3 100644
--- a/core/app_prebuilt_internal.mk
+++ b/core/app_prebuilt_internal.mk
@@ -172,6 +172,12 @@
   $(built_module): PRIVATE_CERTIFICATE_LINEAGE := $(LOCAL_CERTIFICATE_LINEAGE)
 endif
 
+ifneq ($(LOCAL_MODULE_STEM),)
+  PACKAGES.$(LOCAL_MODULE).STEM := $(LOCAL_MODULE_STEM)
+else
+  PACKAGES.$(LOCAL_MODULE).STEM := $(LOCAL_MODULE)
+endif
+
 include $(BUILD_SYSTEM)/app_certificate_validate.mk
 
 # Set a actual_partition_tag (calculated in base_rules.mk) for the package.

core/package_internal.mk

diff --git a/core/package_internal.mk b/core/package_internal.mk
index 62dac99..034a36e 100644
--- a/core/package_internal.mk
+++ b/core/package_internal.mk
@@ -694,6 +694,12 @@
 PACKAGES.$(LOCAL_PACKAGE_NAME).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES))
 PACKAGES.$(LOCAL_PACKAGE_NAME).RESOURCE_FILES := $(all_resources)
 
+ifneq ($(LOCAL_MODULE_STEM),)
+  PACKAGES.$(LOCAL_MODULE).STEM := $(LOCAL_MODULE_STEM)
+else
+  PACKAGES.$(LOCAL_MODULE).STEM := $(LOCAL_MODULE)
+endif
+
 PACKAGES := $(PACKAGES) $(LOCAL_PACKAGE_NAME)
 
 # Reset internal variables.