From e30180b4db074b4eb9457ec15721b4ec0b9f221d Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Tue, 21 Dec 2021 11:41:45 -0800 Subject: [PATCH] Inline usages of LOCAL_STEM Having no variables in include/inherit-product statements makes the conversion to starlark cleaner. Bug: 211659921 Test: Presubmits Change-Id: Ie25a7b8d97d821c2b02aed936e8dbfe779094887 --- self-extractors/root/proprietary/BoardConfigVendor.mk | 6 ++---- self-extractors/root/proprietary/device-vendor.mk | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/self-extractors/root/proprietary/BoardConfigVendor.mk b/self-extractors/root/proprietary/BoardConfigVendor.mk index f684201..29c4eb8 100644 --- a/self-extractors/root/proprietary/BoardConfigVendor.mk +++ b/self-extractors/root/proprietary/BoardConfigVendor.mk @@ -12,7 +12,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -LOCAL_STEM := bramble/BoardConfigPartial.mk - --include vendor/google_devices/$(LOCAL_STEM) --include vendor/qcom/$(LOCAL_STEM) +-include vendor/google_devices/bramble/BoardConfigPartial.mk +-include vendor/qcom/bramble/BoardConfigPartial.mk diff --git a/self-extractors/root/proprietary/device-vendor.mk b/self-extractors/root/proprietary/device-vendor.mk index 60de23f..c2f06f8 100644 --- a/self-extractors/root/proprietary/device-vendor.mk +++ b/self-extractors/root/proprietary/device-vendor.mk @@ -12,7 +12,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -LOCAL_STEM := bramble/device-partial.mk - -$(call inherit-product-if-exists, vendor/google_devices/$(LOCAL_STEM)) -$(call inherit-product-if-exists, vendor/qcom/$(LOCAL_STEM)) +$(call inherit-product-if-exists, vendor/google_devices/bramble/device-partial.mk) +$(call inherit-product-if-exists, vendor/qcom/bramble/device-partial.mk)