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: I9855bf74876f1895429fb5e5c173f619d29c74aa
diff --git a/self-extractors/root/proprietary/BoardConfigVendor.mk b/self-extractors/root/proprietary/BoardConfigVendor.mk
index 088de0f..4e5d82a 100644
--- a/self-extractors/root/proprietary/BoardConfigVendor.mk
+++ b/self-extractors/root/proprietary/BoardConfigVendor.mk
@@ -13,10 +13,9 @@
# limitations under the License.
ifneq ($(filter blueline,$(TARGET_DEVICE)),)
-LOCAL_STEM := blueline/BoardConfigPartial.mk
+-include vendor/google_devices/blueline/BoardConfigPartial.mk
+-include vendor/qcom/blueline/BoardConfigPartial.mk
else
-LOCAL_STEM := crosshatch/BoardConfigPartial.mk
+-include vendor/google_devices/crosshatch/BoardConfigPartial.mk
+-include vendor/qcom/crosshatch/BoardConfigPartial.mk
endif
-
--include vendor/google_devices/$(LOCAL_STEM)
--include vendor/qcom/$(LOCAL_STEM)
diff --git a/self-extractors/root/proprietary/device-vendor.mk b/self-extractors/root/proprietary/device-vendor.mk
index f6c5130..6a95aa6 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 := crosshatch/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/crosshatch/device-partial.mk)
+$(call inherit-product-if-exists, vendor/qcom/crosshatch/device-partial.mk)
diff --git a/self-extractors_blueline/root/proprietary/BoardConfigVendor.mk b/self-extractors_blueline/root/proprietary/BoardConfigVendor.mk
index 088de0f..4e5d82a 100644
--- a/self-extractors_blueline/root/proprietary/BoardConfigVendor.mk
+++ b/self-extractors_blueline/root/proprietary/BoardConfigVendor.mk
@@ -13,10 +13,9 @@
# limitations under the License.
ifneq ($(filter blueline,$(TARGET_DEVICE)),)
-LOCAL_STEM := blueline/BoardConfigPartial.mk
+-include vendor/google_devices/blueline/BoardConfigPartial.mk
+-include vendor/qcom/blueline/BoardConfigPartial.mk
else
-LOCAL_STEM := crosshatch/BoardConfigPartial.mk
+-include vendor/google_devices/crosshatch/BoardConfigPartial.mk
+-include vendor/qcom/crosshatch/BoardConfigPartial.mk
endif
-
--include vendor/google_devices/$(LOCAL_STEM)
--include vendor/qcom/$(LOCAL_STEM)
diff --git a/self-extractors_blueline/root/proprietary/device-vendor.mk b/self-extractors_blueline/root/proprietary/device-vendor.mk
index 852ea5e..23d7f0b 100644
--- a/self-extractors_blueline/root/proprietary/device-vendor.mk
+++ b/self-extractors_blueline/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 := blueline/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/blueline/device-partial.mk)
+$(call inherit-product-if-exists, vendor/qcom/blueline/device-partial.mk)
