device-common.mk: Avoid inherit-product-if-exists for inherit-product to avoid silent failures
Not really critial, but it was pointed out that we probably want
explicit failures rather then silent ones if a inherited file goes
missing.
Change-Id: I9358d55ac2f4436acfc28b08a4aa3e7bacd5ab58
Signed-off-by: John Stultz <john.stultz@linaro.org>
diff --git a/device-common.mk b/device-common.mk
index b07047f..05d82de 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -23,7 +23,7 @@
PRODUCT_IS_ATV := true
else
# Adjust the dalvik heap to be appropriate for a tablet.
-$(call inherit-product-if-exists, frameworks/native/build/tablet-10in-xhdpi-2048-dalvik-heap.mk)
+$(call inherit-product, frameworks/native/build/tablet-10in-xhdpi-2048-dalvik-heap.mk)
endif
# Set vendor kernel path
@@ -196,7 +196,7 @@
frameworks/native/data/etc/android.software.device_admin.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_admin.xml
# Include BT modules
-$(call inherit-product-if-exists, device/linaro/hikey/wpan/ti-wpan-products.mk)
+$(call inherit-product, device/linaro/hikey/wpan/ti-wpan-products.mk)
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \