diff options
| author | Robin Lee <rgl@google.com> | 2021-01-27 07:49:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-27 07:49:18 +0000 |
| commit | 33ed8c2278393e1b71180d0a9cf2a97882ba3cb8 (patch) | |
| tree | e323e0175c1ed97c883d74da8962c0ba47bf560d | |
| parent | e66f6466a088f1f977b71eaa27fb3a6d8977420b (diff) | |
| parent | bff63a4dee59d55c8920ba3aa6b6f6b1c6e81647 (diff) | |
| download | hikey-33ed8c2278393e1b71180d0a9cf2a97882ba3cb8.tar.gz | |
Merge "Revert "Remove device/google/atv/overlay"" am: 537992a84e am: 9b3522d37b am: bff63a4dee
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1559776
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I35ee531f1749296b51d3ecba8c4750e2755dc66c
| -rw-r--r-- | device-common.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/device-common.mk b/device-common.mk index da4710b4..63902616 100644 --- a/device-common.mk +++ b/device-common.mk @@ -43,6 +43,10 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/emulated_storage.mk) # Set custom settings DEVICE_PACKAGE_OVERLAYS := device/linaro/hikey/overlay +ifneq (,$(filter $(TARGET_PRODUCT),hikey960_tv hikey_tv)) +# Set TV Custom Settings +DEVICE_PACKAGE_OVERLAYS += device/google/atv/overlay +endif #avoid usb crash PRODUCT_PRODUCT_PROPERTIES += \ |