commit ee44f98c1b11a1e98b7d3e38932f2280255d296f
author John Stultz <john.stultz@linaro.org> Mon Oct 22 22:18:23 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Oct 22 22:18:23 2018 -0700
tree c72c84cb8dab207219dde7fea3be0ff2a281db72
parent bebbab6af6123a88687ddd54864b6c99061ad8b2
parent 6916b0ed20f1276941f2df0fd3f5cd8aab75bd6d

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

Change-Id: I7304982e85df2b686ba68aff13cdc7b201dc766d

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 \