diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-10-23 05:00:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-23 05:00:51 +0000 |
| commit | 420fd4b41ca911e4ff725102985b127382d0b2b1 (patch) | |
| tree | c72c84cb8dab207219dde7fea3be0ff2a281db72 | |
| parent | e684342a0ae48299607c5918874545993a2140b9 (diff) | |
| parent | 58bae7530f6d05f9f3b7074855aa35fce9988d3e (diff) | |
| download | hikey-420fd4b41ca911e4ff725102985b127382d0b2b1.tar.gz | |
Merge "device-common.mk: Avoid inherit-product-if-exists for inherit-product to avoid silent failures"
| -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 \ |