From b19fd21ddce9238cd97e52bb22847e512080ed29 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Tue, 21 Dec 2021 11:55:18 -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: Icfac35c62267a3cdb718cce4ebb9e7c131125e59 --- self-extractors/root/proprietary/BoardConfigVendor.mk | 4 +--- self-extractors/root/proprietary/device-vendor.mk | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/self-extractors/root/proprietary/BoardConfigVendor.mk b/self-extractors/root/proprietary/BoardConfigVendor.mk index 8961a85..7aa8ac5 100644 --- a/self-extractors/root/proprietary/BoardConfigVendor.mk +++ b/self-extractors/root/proprietary/BoardConfigVendor.mk @@ -12,6 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -LOCAL_STEM := bluejay/BoardConfigPartial.mk - --include vendor/google_devices/$(LOCAL_STEM) +-include vendor/google_devices/bluejay/BoardConfigPartial.mk diff --git a/self-extractors/root/proprietary/device-vendor.mk b/self-extractors/root/proprietary/device-vendor.mk index 4a50075..297bdd9 100644 --- a/self-extractors/root/proprietary/device-vendor.mk +++ b/self-extractors/root/proprietary/device-vendor.mk @@ -12,6 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -LOCAL_STEM := bluejay/device-partial.mk - -$(call inherit-product-if-exists, vendor/google_devices/$(LOCAL_STEM)) +$(call inherit-product-if-exists, vendor/google_devices/bluejay/device-partial.mk)