diff options
| author | Jean-François Geyelin <jif@google.com> | 2024-02-16 17:09:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-02-16 17:09:22 +0000 |
| commit | d2b40f991deb77dd88f78278c0f484de0b923fa4 (patch) | |
| tree | 663c589dabd5c8dad64daa1c1a4fcbaef4a4f680 | |
| parent | 2842ca27c6e2a9c9317bc80da1f79e75f0133340 (diff) | |
| parent | 81634ff43eeec5d4c99cd046d2870020dd9c1e07 (diff) | |
| download | cuttlefish-d2b40f991deb77dd88f78278c0f484de0b923fa4.tar.gz | |
Merge "Exclude widevine from RISC-V Cuttlefish images" into main
| -rw-r--r-- | shared/device.mk | 3 | ||||
| -rw-r--r-- | vsoc_riscv64/phone/aosp_cf.mk | 1 | ||||
| -rw-r--r-- | vsoc_riscv64/slim/aosp_cf.mk | 1 | ||||
| -rw-r--r-- | vsoc_riscv64/wear/aosp_cf.mk | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/shared/device.mk b/shared/device.mk index 79a0f1c44..e795838d2 100644 --- a/shared/device.mk +++ b/shared/device.mk @@ -331,7 +331,10 @@ PRODUCT_PACKAGES += \ android.hardware.drm@latest-service.clearkey endif +LOCAL_ENABLE_WIDEVINE ?= true +ifeq ($(LOCAL_ENABLE_WIDEVINE),true) -include vendor/widevine/libwvdrmengine/apex/device/device.mk +endif # # Confirmation UI HAL diff --git a/vsoc_riscv64/phone/aosp_cf.mk b/vsoc_riscv64/phone/aosp_cf.mk index 2f2655e4c..b5af1b907 100644 --- a/vsoc_riscv64/phone/aosp_cf.mk +++ b/vsoc_riscv64/phone/aosp_cf.mk @@ -37,6 +37,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) # All components inherited here go to vendor image # LOCAL_PREFER_VENDOR_APEX := true +LOCAL_ENABLE_WIDEVINE := false $(call inherit-product, device/google/cuttlefish/shared/phone/device_vendor.mk) PRODUCT_ENFORCE_MAC80211_HWSIM := false diff --git a/vsoc_riscv64/slim/aosp_cf.mk b/vsoc_riscv64/slim/aosp_cf.mk index d3fc2a0b3..ce71274d6 100644 --- a/vsoc_riscv64/slim/aosp_cf.mk +++ b/vsoc_riscv64/slim/aosp_cf.mk @@ -38,6 +38,7 @@ PRODUCT_PACKAGES += FakeSystemApp # All components inherited here go to vendor image # LOCAL_PREFER_VENDOR_APEX := true +LOCAL_ENABLE_WIDEVINE := false $(call inherit-product, device/google/cuttlefish/shared/slim/device_vendor.mk) PRODUCT_ENFORCE_MAC80211_HWSIM := false diff --git a/vsoc_riscv64/wear/aosp_cf.mk b/vsoc_riscv64/wear/aosp_cf.mk index 959ba431c..a79e48940 100644 --- a/vsoc_riscv64/wear/aosp_cf.mk +++ b/vsoc_riscv64/wear/aosp_cf.mk @@ -52,6 +52,7 @@ $(call inherit-product, device/google/cuttlefish/shared/wear/aosp_product.mk) # # All components inherited here go to vendor image # +LOCAL_ENABLE_WIDEVINE := false $(call inherit-product, device/google/cuttlefish/shared/wear/aosp_vendor.mk) $(call inherit-product, device/google/cuttlefish/shared/wear/device_vendor.mk) |