commit b2f8d5c2e66323de61224dfb9dc6b7244e8f1d90
author Treehugger Robot <treehugger-gerrit@google.com> Wed Dec 22 18:41:58 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 22 18:41:58 2021 +0000
tree 3b646c1fee6447b380f2e42065756540dfa0922c
parent 02944860b7b703953cc3ea48dff4c06f4b74b4b8
parent 1cd1f2e53c3ff998d8b4a0086684886a31dfe1d8

Merge "Inline usages of LOCAL_STEM"

self-extractors/root/proprietary/BoardConfigVendor.mk

diff --git a/self-extractors/root/proprietary/BoardConfigVendor.mk b/self-extractors/root/proprietary/BoardConfigVendor.mk
index 3db23cb..a828720 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 := redfin/BoardConfigPartial.mk
-
--include vendor/google_devices/$(LOCAL_STEM)
--include vendor/qcom/$(LOCAL_STEM)
+-include vendor/google_devices/redfin/BoardConfigPartial.mk
+-include vendor/qcom/redfin/BoardConfigPartial.mk

self-extractors/root/proprietary/device-vendor.mk

diff --git a/self-extractors/root/proprietary/device-vendor.mk b/self-extractors/root/proprietary/device-vendor.mk
index 4fc6a83..ec7073c 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 := redfin/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/redfin/device-partial.mk)
+$(call inherit-product-if-exists, vendor/qcom/redfin/device-partial.mk)