| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-12-05 17:22:30 (GMT) |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2019-12-05 17:22:30 (GMT) |
| commit | 64714510cf2de3c340b9e9cdc93012ab54beebc9 (patch) | |
| tree | 3073ed23c8e0fd60ad092f72e9abc8e654710f9d | |
| parent | 88b7e62d22ad897d97c2ff30685d55774a2497a2 (diff) | |
| parent | fdfd83bc44a38943d6baff445e4c5752e30dad71 (diff) | |
| download | common-64714510cf2de3c340b9e9cdc93012ab54beebc9.zip common-64714510cf2de3c340b9e9cdc93012ab54beebc9.tar.gz common-64714510cf2de3c340b9e9cdc93012ab54beebc9.tar.bz2 | |
Merge "Add storm/storm_no_netflix build targets" into p-tv-dev
| -rwxr-xr-x | software.mk | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/software.mk b/software.mk index 82687dd..745c65e 100755 --- a/software.mk +++ b/software.mk @@ -1,6 +1,3 @@ -# 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 @@ -12,7 +9,7 @@ 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) +ifeq ($(TARGET_BUILD_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 @@ -67,11 +64,9 @@ 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) PRODUCT_COPY_FILES += \ |