| author | Michal Olech <molech@google.com> | 2019-11-27 13:20:07 (GMT) |
|---|---|---|
| committer | Michal Olech <molech@google.com> | 2019-11-27 13:20:07 (GMT) |
| commit | fdfd83bc44a38943d6baff445e4c5752e30dad71 (patch) | |
| tree | 65d59c5be801ecd36ad788bb89a5786fa93b66cd | |
| parent | e0c3aa33a01c2bb908d42533b611681826cc95e8 (diff) | |
| download | common-fdfd83bc44a38943d6baff445e4c5752e30dad71.zip common-fdfd83bc44a38943d6baff445e4c5752e30dad71.tar.gz common-fdfd83bc44a38943d6baff445e4c5752e30dad71.tar.bz2 | |
Add storm/storm_no_netflix build targets
In similar fashion to adt3/adt3_netflix. Long story short, we need a
uniquely identifiable build fingerprint for every product flavour (see
b/144598605 for details).
This change adds:
* storm
* storm_no_netflix
and removes all unnecessary make flags in favour of build configs (e.g.
netflix.mk).
Bug: 144373033
Test: built locally and smoke tested affected targets
Change-Id: Iac5eed297410bfec4e1c2780d2fae4beda912098
| -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 += \ |