| author | Loic WEI YU NENG <loicweiyuneng@google.com> | 2019-10-25 20:36:36 (GMT) |
|---|---|---|
| committer | Loic WEI YU NENG <loicweiyuneng@google.com> | 2019-10-30 01:03:26 (GMT) |
| commit | e0c3aa33a01c2bb908d42533b611681826cc95e8 (patch) | |
| tree | 0a32b035be14b16ded350a0b35678ec9d716f588 | |
| parent | 9fe66bdfef602d9cb42639386a1f0b9f8773c15b (diff) | |
| download | common-e0c3aa33a01c2bb908d42533b611681826cc95e8.zip common-e0c3aa33a01c2bb908d42533b611681826cc95e8.tar.gz common-e0c3aa33a01c2bb908d42533b611681826cc95e8.tar.bz2 | |
Use HAS_NETFLIX Makefile variable to allow the removal of Netflix on Storm
Bug: 143311573
Test: Validate the several builds flavors on deadpool device
Change-Id: Ibc957ced05b0eda982904a2c48660f4196b1feac
| -rw-r--r-- | android.software.google_atv.xml | 1 | ||||
| -rw-r--r-- | android.software.google_atv_netflix_only.xml | 4 | ||||
| -rwxr-xr-x | software.mk | 10 |
3 files changed, 13 insertions, 2 deletions
diff --git a/android.software.google_atv.xml b/android.software.google_atv.xml index 1a370cf..38add8a 100644 --- a/android.software.google_atv.xml +++ b/android.software.google_atv.xml @@ -7,6 +7,5 @@ <feature name="android.software.leanback_only" /> <feature name="android.software.cant_save_state" /> <!-- for google play store --> - <feature name="nrdp.modelgroup" /> <feature name="com.google.android.tv.installed" /> </permissions> diff --git a/android.software.google_atv_netflix_only.xml b/android.software.google_atv_netflix_only.xml new file mode 100644 index 0000000..94430fc --- a/dev/null +++ b/android.software.google_atv_netflix_only.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<permissions> + <feature name="nrdp.modelgroup" /> +</permissions> diff --git a/software.mk b/software.mk index 4d80c64..82687dd 100755 --- a/software.mk +++ b/software.mk @@ -1,3 +1,6 @@ +# In case HAS_NETFLIX flag isn't defined on device.mk +HAS_NETFLIX ?= true + ifeq ($(TARGET_BUILD_CTS), true) #ADDITIONAL_DEFAULT_PROPERTIES += ro.vold.forceencryption=1 @@ -9,6 +12,10 @@ PRODUCT_COPY_FILES += \ ifeq ($(TARGET_BUILD_GOOGLE_ATV), true) PRODUCT_COPY_FILES += \ device/amlogic/common/android.software.google_atv.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.google_atv.xml +ifeq ($(HAS_NETFLIX), true) +PRODUCT_COPY_FILES += \ + device/amlogic/common/android.software.google_atv_netflix_only.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.google_atv_netflix_only.xml +endif PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.live_tv.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/android.software.live_tv.xml PRODUCT_PACKAGE_OVERLAYS += device/amlogic/common/atv_gms_overlay @@ -60,9 +67,10 @@ PRODUCT_PACKAGES += \ endif ifeq ($(TARGET_BUILD_NETFLIX), true) +ifeq ($(HAS_NETFLIX), true) PRODUCT_COPY_FILES += \ device/amlogic/common/droidlogic.software.netflix.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/droidlogic.software.netflix.xml - +endif endif ifeq ($(BOARD_AVB_ENABLE), true) |