diff options
| author | BK Choi <bkchoi@google.com> | 2023-05-23 01:21:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-05-23 01:21:30 +0000 |
| commit | a8850e3e5734c53481005a5adf45264107c8d6af (patch) | |
| tree | eb1607c01eea21ec03fce001b554631362a9ecbd | |
| parent | 59ec26428af2c0dbf9d6520e8bbce9b88894a397 (diff) | |
| parent | 47f940e762b2e1e98bc5e03929b29bcc7009b16e (diff) | |
| download | cuttlefish-a8850e3e5734c53481005a5adf45264107c8d6af.tar.gz | |
Merge "Disable telephony feature from automotive cuttlefish." into udc-dev
| -rw-r--r-- | vsoc_x86_64_only/auto/aosp_cf.mk | 4 | ||||
| -rw-r--r-- | vsoc_x86_64_only/auto_md/aosp_cf.mk | 4 | ||||
| -rw-r--r-- | vsoc_x86_64_only/auto_mdnd/aosp_cf.mk | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/vsoc_x86_64_only/auto/aosp_cf.mk b/vsoc_x86_64_only/auto/aosp_cf.mk index 581486773..b817e214a 100644 --- a/vsoc_x86_64_only/auto/aosp_cf.mk +++ b/vsoc_x86_64_only/auto/aosp_cf.mk @@ -27,6 +27,10 @@ PRODUCT_ENFORCE_RRO_TARGETS := frameworks-res # FIXME: Disable mainline path checks PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := false +# HSUM is currently incompatible with telephony. +# TODO(b/283853205): Properly disable telephony using per-partition makefile. +TARGET_NO_TELEPHONY := true + # # All components inherited here go to system_ext image # diff --git a/vsoc_x86_64_only/auto_md/aosp_cf.mk b/vsoc_x86_64_only/auto_md/aosp_cf.mk index 4222c8ea7..c0584989f 100644 --- a/vsoc_x86_64_only/auto_md/aosp_cf.mk +++ b/vsoc_x86_64_only/auto_md/aosp_cf.mk @@ -25,6 +25,10 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGE_OVERLAYS += \ device/google/cuttlefish/shared/auto_md/overlay +# HSUM is currently incompatible with telephony. +# TODO(b/283853205): Properly disable telephony using per-partition makefile. +TARGET_NO_TELEPHONY := true + ENABLE_CLUSTER_OS_DOUBLE:=true PRODUCT_PACKAGES += \ diff --git a/vsoc_x86_64_only/auto_mdnd/aosp_cf.mk b/vsoc_x86_64_only/auto_mdnd/aosp_cf.mk index abc1b9d12..a80d83765 100644 --- a/vsoc_x86_64_only/auto_mdnd/aosp_cf.mk +++ b/vsoc_x86_64_only/auto_mdnd/aosp_cf.mk @@ -21,6 +21,10 @@ $(call inherit-product, device/google/cuttlefish/vsoc_x86_64_only/auto_md/aosp_cf.mk) +# HSUM is currently incompatible with telephony. +# TODO(b/283853205): Properly disable telephony using per-partition makefile. +TARGET_NO_TELEPHONY := true + PRODUCT_NAME := aosp_cf_x86_64_auto_mdnd PRODUCT_MODEL := Cuttlefish x86_64 auto 64-bit only multi-displays, no-driver |