| -rw-r--r-- | core_amlogic.mk | 17 | ||||
| -rw-r--r-- | core_base_atv.mk | 64 | ||||
| -rw-r--r-- | init.amlogic.wifi_buildin.rc | 1 | ||||
| -rw-r--r-- | init.amlogic.wifi_buildin_ap62x8.rc | 1 | ||||
| -rw-r--r-- | patch/Readme.txt | 12 | ||||
| -rw-r--r-- | products/tv/init.amlogic.rc | 3 | ||||
| -rw-r--r-- | products/tv/product_tv.mk | 5 | ||||
| -rw-r--r-- | sepolicy/device.te | 3 | ||||
| -rw-r--r-- | sepolicy/file.te | 7 | ||||
| -rw-r--r-- | sepolicy/file_contexts | 22 | ||||
| -rw-r--r-- | sepolicy/hal_audio_default.te | 1 | ||||
| -rw-r--r-- | sepolicy/hal_graphics_composer_default.te | 4 | ||||
| -rw-r--r-- | sepolicy/hal_tv_input_default.te | 6 | ||||
| -rw-r--r-- | sepolicy/hwservice.te | 1 | ||||
| -rw-r--r-- | sepolicy/hwservice_contexts | 4 | ||||
| -rw-r--r-- | sepolicy/hwservicemanager.te | 5 | ||||
| -rw-r--r-- | sepolicy/mediacodec.te | 2 | ||||
| -rw-r--r-- | sepolicy/system_app.te | 8 | ||||
| -rw-r--r-- | sepolicy/system_control.te | 15 | ||||
| -rw-r--r-- | sepolicy/tvserver.te | 48 | ||||
| -rw-r--r-- | wifi.mk | 7 | ||||
| -rw-r--r-- | wifi_driver.mk | 8 | ||||
| -rw-r--r-- | wifi_modules.mk | 1 |
23 files changed, 207 insertions, 38 deletions
diff --git a/core_amlogic.mk b/core_amlogic.mk index 9cc1943..f601910 100644 --- a/core_amlogic.mk +++ b/core_amlogic.mk @@ -126,8 +126,11 @@ $(call inherit-product-if-exists, external/naver-fonts/fonts.mk) $(call inherit-product-if-exists, external/roboto-fonts/fonts.mk) $(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk) $(call inherit-product-if-exists, frameworks/webview/chromium/chromium.mk) -$(call inherit-product, build/target/product/core_base.mk) - +ifneq ($(TARGET_BUILD_GOOGLE_ATV), true) + $(call inherit-product, build/target/product/core_base.mk) +else + $(call inherit-product, device/amlogic/common/core_base_atv.mk) +endif #default hardware composer version is 2.0 TARGET_USES_HWC2 := true @@ -166,6 +169,12 @@ PRODUCT_PACKAGES += \ Music endif +ifeq ($(TARGET_BUILD_LIVETV), true) +PRODUCT_PACKAGES += LiveTv +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.software.picture_in_picture.xml:vendor/etc/permissions/android.software.picture_in_picture.xml +endif + PRODUCT_PACKAGES += \ droidlogic \ droidlogic-res \ @@ -434,8 +443,8 @@ PRODUCT_PACKAGES += \ # DroidVold PRODUCT_PACKAGES += \ - vendor.amlogic.hardware.droidvold@10 \ - vendor.amlogic.hardware.droidvold@10_vendor \ + vendor.amlogic.hardware.droidvold@1.0 \ + vendor.amlogic.hardware.droidvold@1.0_vendor \ vendor.amlogic.hardware.droidvold-V1.0-java ifeq ($(TARGET_BUILD_GOOGLE_ATV), true) |