From 1a6034f154adff726fbbe2bcda575c8b4b1ea041 Mon Sep 17 00:00:00 2001 From: "Kevin F. Haggerty" Date: Fri, 9 Apr 2021 08:18:37 -0600 Subject: [PATCH] matisse-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 | 5 ++--- matisse.mk | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 84bcb26..d56ef75 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -1,5 +1,5 @@ # Copyright (C) 2016 The CyanogenMod Project -# Copyright (C) 2017 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. @@ -112,5 +112,4 @@ include $(COMMON_PATH)/sepolicy/sepolicy.mk TARGET_NO_SENSOR_PERMISSION_CHECK := true # inherit from the proprietary version --include vendor/samsung/matisse-common/BoardConfigVendor.mk - +include vendor/samsung/matisse-common/BoardConfigVendor.mk diff --git a/matisse.mk b/matisse.mk index 92b6a45..7b2f44e 100644 --- a/matisse.mk +++ b/matisse.mk @@ -1,6 +1,6 @@ # # Copyright (C) 2014-2016 The CyanogenMod Project -# Copyright (C) 2017-2018 The LineageOS Project +# Copyright (C) 2017-2018,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. @@ -104,7 +104,7 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/thermal-engine-8226.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine-8226.conf # Get non-open-source specific aspects -$(call inherit-product-if-exists, vendor/samsung/matisse-common/matisse-common-vendor.mk) +$(call inherit-product, vendor/samsung/matisse-common/matisse-common-vendor.mk) # common msm8226 $(call inherit-product, device/samsung/msm8226-common/msm8226.mk)