From 3eed52715078607f8a2901a0ad691c2544d63e41 Mon Sep 17 00:00:00 2001
From: "Christopher N. Hesse" <raymanfx@gmail.com>
Date: Tue, 18 Apr 2017 09:22:49 +0200
Subject: sdm660-common: Enforce vendor tree presence

A compiled build has no chance of booting without the prebuilt
binaries, so fail the build if those are not present.

Change-Id: Iadd43e887d426732e549969ab8deb14194ca818d
---
 BoardConfigCommon.mk | 2 +-
 sdm660.mk            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 73a9d11..00e36ed 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -206,4 +206,4 @@ WIFI_HIDL_FEATURE_DUAL_INTERFACE := true
 WPA_SUPPLICANT_VERSION := VER_0_8_X
 
 # Inherit the proprietary files
--include vendor/xiaomi/sdm660-common/BoardConfigVendor.mk
+include vendor/xiaomi/sdm660-common/BoardConfigVendor.mk
diff --git a/sdm660.mk b/sdm660.mk
index fccdf24..5a43a11 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -21,9 +21,6 @@
 # definition file).
 #
 
-# Inherit proprietary files
-$(call inherit-product, vendor/xiaomi/sdm660-common/sdm660-common-vendor.mk)
-
 # Inherit properties
 $(call inherit-product, $(LOCAL_PATH)/properties.mk)
 PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true
@@ -466,3 +463,6 @@ PRODUCT_PACKAGES += \
 
 PRODUCT_BOOT_JARS += \
     WfdCommon
+
+# Inherit the proprietary files
+$(call inherit-product, vendor/xiaomi/sdm660-common/sdm660-common-vendor.mk)
-- 
cgit v1.2.3