summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Kiryanov <rkir@google.com>2023-11-23 12:45:43 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-23 12:45:43 +0000
commit3fdcbc1dad176a8838b30212ea631aacfa1651bb (patch)
tree4b98492d3c51fccbd7efebf27d13573333daafe2
parent9c8a6d4d760f7bcbfe1742159f84d97a8fdb6636 (diff)
parentd93ccc2597d43a8c54d9a70ce421a06afa581889 (diff)
downloadatv-3fdcbc1dad176a8838b30212ea631aacfa1651bb.tar.gz
Move x86-vendor.mk into board/emu64x/kernel_fstab_32.mk am: 43a0e37df3 am: 2c84794c67 am: d93ccc2597
Original change: https://android-review.googlesource.com/c/device/google/atv/+/2844133 Change-Id: Iea331d8bf07b7042ea06dbd5fa392f56d3b77db0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--products/aosp_tv_x86.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/products/aosp_tv_x86.mk b/products/aosp_tv_x86.mk
index 474c5ed..f7cad49 100644
--- a/products/aosp_tv_x86.mk
+++ b/products/aosp_tv_x86.mk
@@ -61,7 +61,7 @@ endif
# All components inherited here go to vendor image
#
$(call inherit-product, device/google/atv/products/atv_emulator_vendor.mk)
-$(call inherit-product-if-exists, device/generic/goldfish/x86-vendor.mk)
+$(call inherit-product, device/generic/goldfish/board/emu64x/kernel_fstab_32.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk)
ifeq (aosp_tv_x86,$(TARGET_PRODUCT))