diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-02-13 03:26:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-02-13 03:26:36 +0000 |
| commit | 0fdc003c25931c743cba81ce4dc1d0253abd382f (patch) | |
| tree | 314559188a3b0fa14a73db3aa958d9f4aff2b86f | |
| parent | 58b06af4e1bca3b4e6176f324dc400781a426a21 (diff) | |
| parent | 793d2f59594a0956bd67609c146afaeb5943187a (diff) | |
| download | atv-0fdc003c25931c743cba81ce4dc1d0253abd382f.tar.gz | |
Merge "Move AudioTv from atv_system to atv_product."
| -rw-r--r-- | products/atv_product.mk | 2 | ||||
| -rw-r--r-- | products/atv_system.mk | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/products/atv_product.mk b/products/atv_product.mk index 5946c92..9956bbb 100644 --- a/products/atv_product.mk +++ b/products/atv_product.mk @@ -17,6 +17,8 @@ # a generic TV device. $(call inherit-product, $(SRC_TARGET_DIR)/product/media_product.mk) +$(call inherit-product-if-exists, frameworks/base/data/sounds/AudioTv.mk) + PRODUCT_PACKAGES += \ SettingsIntelligence \ SystemUI \ diff --git a/products/atv_system.mk b/products/atv_system.mk index 237e493..78255df 100644 --- a/products/atv_system.mk +++ b/products/atv_system.mk @@ -17,7 +17,6 @@ # a generic TV device. $(call inherit-product, $(SRC_TARGET_DIR)/product/media_system.mk) -$(call inherit-product-if-exists, frameworks/base/data/sounds/AudioTv.mk) $(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk) $(call inherit-product-if-exists, external/google-fonts/dancing-script/fonts.mk) $(call inherit-product-if-exists, external/google-fonts/carrois-gothic-sc/fonts.mk) |