commit 6916b0ed20f1276941f2df0fd3f5cd8aab75bd6d
author John Stultz <john.stultz@linaro.org> Mon Oct 22 22:14:06 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Oct 22 22:14:06 2018 -0700
tree c72c84cb8dab207219dde7fea3be0ff2a281db72
parent e684342a0ae48299607c5918874545993a2140b9
parent 420fd4b41ca911e4ff725102985b127382d0b2b1

Merge "device-common.mk: Avoid inherit-product-if-exists for inherit-product to avoid silent failures"
am: 420fd4b41c

Change-Id: I7b00781352790cd9e4c622b30a14f8a120f13e2d

device-common.mk

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 \