From dbc57d889cfa3a7cba2b135870b72bffcb1436e1 Mon Sep 17 00:00:00 2001 From: "Kevin F. Haggerty" Date: Fri, 9 Apr 2021 08:18:37 -0600 Subject: [PATCH] msm8974-common: Don't let builds complete without vendor tree * There is zero reason to ever build without blobs. We've even seen this situation with official builds from our servers. It's always better for a build to fail than it is for it to produce something that has no chance at working. Change-Id: I4968795670c91f691e9ecdc0e4af62e16ba3a93a --- BoardConfigCommon.mk | 4 ++-- msm8974.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 98d2a9a..3d15e1e 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -1,5 +1,5 @@ # Copyright (C) 2012 The CyanogenMod Project -# Copyright (C) 2017-2019 The LineageOS Project +# Copyright (C) 2017-2019,2021 The LineageOS Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -100,4 +100,4 @@ TARGET_RECOVERY_DEVICE_DIRS += device/samsung/msm8974-common BOARD_USES_QC_TIME_SERVICES := true # inherit from the proprietary version --include vendor/samsung/msm8974-common/BoardConfigVendor.mk +include vendor/samsung/msm8974-common/BoardConfigVendor.mk diff --git a/msm8974.mk b/msm8974.mk index f1193f7..79ca849 100644 --- a/msm8974.mk +++ b/msm8974.mk @@ -1,5 +1,5 @@ # Copyright (C) 2012 The CyanogenMod Project -# Copyright (C) 2017-2020 The LineageOS Project +# Copyright (C) 2017-2021 The LineageOS Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -210,7 +210,7 @@ PRODUCT_PACKAGES += \ wpa_supplicant.conf # Get non-open-source specific aspects -$(call inherit-product-if-exists, vendor/samsung/msm8974-common/msm8974-common-vendor.mk) +$(call inherit-product, vendor/samsung/msm8974-common/msm8974-common-vendor.mk) # common msm8974 $(call inherit-product, device/samsung/qcom-common/qcom-common.mk)