From 13a1e928ec3fdf56f83cfb6f4807b6fea26f8102 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Tue, 21 Dec 2021 11:44:31 -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: I70bdaced349694b2e76c7fe8e500876a56e1efaf --- self-extractors_oriole/root/proprietary/BoardConfigVendor.mk | 4 +--- self-extractors_oriole/root/proprietary/device-vendor.mk | 4 +--- self-extractors_raven/root/proprietary/BoardConfigVendor.mk | 4 +--- self-extractors_raven/root/proprietary/device-vendor.mk | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/self-extractors_oriole/root/proprietary/BoardConfigVendor.mk b/self-extractors_oriole/root/proprietary/BoardConfigVendor.mk index fa00b92..a632ec4 100644 --- a/self-extractors_oriole/root/proprietary/BoardConfigVendor.mk +++ b/self-extractors_oriole/root/proprietary/BoardConfigVendor.mk @@ -12,6 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -LOCAL_STEM := oriole/BoardConfigPartial.mk - --include vendor/google_devices/$(LOCAL_STEM) +-include vendor/google_devices/oriole/BoardConfigPartial.mk diff --git a/self-extractors_oriole/root/proprietary/device-vendor.mk b/self-extractors_oriole/root/proprietary/device-vendor.mk index aa3ae50..30e512a 100644 --- a/self-extractors_oriole/root/proprietary/device-vendor.mk +++ b/self-extractors_oriole/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 := oriole/device-partial.mk - -$(call inherit-product-if-exists, vendor/google_devices/$(LOCAL_STEM)) +$(call inherit-product-if-exists, vendor/google_devices/oriole/device-partial.mk) diff --git a/self-extractors_raven/root/proprietary/BoardConfigVendor.mk b/self-extractors_raven/root/proprietary/BoardConfigVendor.mk index 25a880e..6e788fc 100644 --- a/self-extractors_raven/root/proprietary/BoardConfigVendor.mk +++ b/self-extractors_raven/root/proprietary/BoardConfigVendor.mk @@ -12,6 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -LOCAL_STEM := raven/BoardConfigPartial.mk - --include vendor/google_devices/$(LOCAL_STEM) +-include vendor/google_devices/raven/BoardConfigPartial.mk diff --git a/self-extractors_raven/root/proprietary/device-vendor.mk b/self-extractors_raven/root/proprietary/device-vendor.mk index 4877f39..2be1993 100644 --- a/self-extractors_raven/root/proprietary/device-vendor.mk +++ b/self-extractors_raven/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 := raven/device-partial.mk - -$(call inherit-product-if-exists, vendor/google_devices/$(LOCAL_STEM)) +$(call inherit-product-if-exists, vendor/google_devices/raven/device-partial.mk)