diff options
| author | Alfred Piccioni <alpic@google.com> | 2023-06-05 17:39:02 +0200 |
|---|---|---|
| committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2023-06-12 15:32:45 +0000 |
| commit | 47e14169be2856ed30e5a34a86513566a74cd28b (patch) | |
| tree | bcae3626ce93a6d5fe211806ae92f781e7b0d8bd /products | |
| parent | 78a5796ef43596cbe92f99620ce702e15129d323 (diff) | |
| download | atv-47e14169be2856ed30e5a34a86513566a74cd28b.tar.gz | |
Add emulator vendor to ARM64 emulator.
Test: Builds, will check with ADRT stage.
Bug: 243615051
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9facde17bcc6d36713516d21a29369f3daf4f62b)
Merged-In: I3d78e774fb3213d020215ce6afee4c2b43145455
Change-Id: I3d78e774fb3213d020215ce6afee4c2b43145455
Diffstat (limited to 'products')
| -rw-r--r-- | products/atv_emulator_vendor.mk | 10 | ||||
| -rw-r--r-- | products/sdk_atv_arm64.mk | 1 |
2 files changed, 9 insertions, 2 deletions
diff --git a/products/atv_emulator_vendor.mk b/products/atv_emulator_vendor.mk index 1f3e789..f333c38 100644 --- a/products/atv_emulator_vendor.mk +++ b/products/atv_emulator_vendor.mk @@ -22,7 +22,9 @@ EMULATOR_VENDOR_NO_GNSS := true EMULATOR_VENDOR_NO_BIOMETRICS := true EMULATOR_VENDOR_NO_SENSORS := true -$(call inherit-product, device/google/atv/products/atv_vendor.mk) +ifneq ($(PRODUCT_IS_ATV_ARM64_SDK),true) + $(call inherit-product, device/google/atv/products/atv_vendor.mk) +endif # Sets HDMI CEC as Playback Device. PRODUCT_PROPERTY_OVERRIDES += ro.hdmi.device_type=4 @@ -56,7 +58,11 @@ PRODUCT_COPY_FILES += \ device/google/atv/permissions/tv_sdk_excluded_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/tv_sdk_excluded_core_hardware.xml # goldfish vendor partition configurations -$(call inherit-product-if-exists, device/generic/goldfish/64bitonly/product/vendor.mk) +ifeq ($(PRODUCT_IS_ATV_ARM64_SDK),true) + $(call inherit-product-if-exists, device/generic/goldfish/64bitonly/product/emulator64_vendor.mk) +else + $(call inherit-product-if-exists, device/generic/goldfish/64bitonly/product/vendor.mk) +endif #watchdog tiggers reboot because location service is not #responding, disble it for now. diff --git a/products/sdk_atv_arm64.mk b/products/sdk_atv_arm64.mk index f887f8b..2a0b119 100644 --- a/products/sdk_atv_arm64.mk +++ b/products/sdk_atv_arm64.mk @@ -14,6 +14,7 @@ # limitations under the License. # PRODUCT_IS_ATV_SDK := true +PRODUCT_IS_ATV_ARM64_SDK := true # Overrides PRODUCT_BRAND := Android |