diff options
| author | John Stultz <john.stultz@linaro.org> | 2018-10-18 13:13:24 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2018-10-18 13:13:24 -0700 |
| commit | 58bae7530f6d05f9f3b7074855aa35fce9988d3e (patch) | |
| tree | c72c84cb8dab207219dde7fea3be0ff2a281db72 | |
| parent | 4918df198178c9c8fca3458321a1493f14274435 (diff) | |
| download | hikey-58bae7530f6d05f9f3b7074855aa35fce9988d3e.tar.gz | |
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>
| -rw-r--r-- | device-common.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/device-common.mk b/device-common.mk index b07047f4..05d82dea 100644 --- a/device-common.mk +++ b/device-common.mk @@ -23,7 +23,7 @@ PRODUCT_AAPT_PREF_CONFIG := tvdpi 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 @@ PRODUCT_COPY_FILES += \ 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 \ |