From e662209bee16d2c18d576e37f4be6d68469d33cb Mon Sep 17 00:00:00 2001 From: Roman Kiryanov Date: Fri, 3 Nov 2023 10:07:03 -0700 Subject: [PATCH] Retire emulator build files from build/make they were moved to device/generic/goldfish Bug: 295259752 Test: presubmit Change-Id: I996811e8703b43313fca3ac819e6ed333d37866b Signed-off-by: Roman Kiryanov --- target/board/BoardConfigEmuCommon.mk | 74 ---------------------------- target/product/emulator_system.mk | 24 --------- 2 files changed, 98 deletions(-) delete mode 100644 target/board/BoardConfigEmuCommon.mk delete mode 100644 target/product/emulator_system.mk diff --git a/target/board/BoardConfigEmuCommon.mk b/target/board/BoardConfigEmuCommon.mk deleted file mode 100644 index 6ed08f04cf..0000000000 --- a/target/board/BoardConfigEmuCommon.mk +++ /dev/null @@ -1,74 +0,0 @@ -# BoardConfigEmuCommon.mk -# -# Common compile-time definitions for emulator -# - -HAVE_HTC_AUDIO_DRIVER := true -BOARD_USES_GENERIC_AUDIO := true -TARGET_BOOTLOADER_BOARD_NAME := goldfish_$(TARGET_ARCH) - -# No Kernel -TARGET_NO_KERNEL := true - -# no hardware camera -USE_CAMERA_STUB := true - -NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3 - -# Build OpenGLES emulation guest and host libraries -BUILD_EMULATOR_OPENGL := true -BUILD_QEMU_IMAGES := true - -# Build and enable the OpenGL ES View renderer. When running on the emulator, -# the GLES renderer disables itself if host GL acceleration isn't available. -USE_OPENGL_RENDERER := true - -# Emulator doesn't support sparse image format. -TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true - -# emulator is Non-A/B device -AB_OTA_UPDATER := false - -# emulator needs super.img -BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT := true - -# 8G + 8M -BOARD_SUPER_PARTITION_SIZE ?= 8598323200 -BOARD_SUPER_PARTITION_GROUPS := emulator_dynamic_partitions - -BOARD_EMULATOR_DYNAMIC_PARTITIONS_PARTITION_LIST := \ - system \ - system_dlkm \ - system_ext \ - product \ - vendor - -TARGET_COPY_OUT_PRODUCT := product -BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 -TARGET_COPY_OUT_SYSTEM_EXT := system_ext -BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4 - -BOARD_USES_SYSTEM_DLKMIMAGE := true -BOARD_SYSTEM_DLKMIMAGE_FILE_SYSTEM_TYPE := erofs -TARGET_COPY_OUT_SYSTEM_DLKM := system_dlkm - -# 8G -BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE ?= 8589934592 - -#vendor boot -BOARD_INCLUDE_DTB_IN_BOOTIMG := false -BOARD_BOOT_HEADER_VERSION := 4 -BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION) -BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE := 0x06000000 -BOARD_RAMDISK_USE_LZ4 := true - -# Enable chain partition for system. -BOARD_AVB_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem -BOARD_AVB_SYSTEM_ALGORITHM := SHA256_RSA2048 -BOARD_AVB_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) -BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 1 - -BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 -BOARD_FLASH_BLOCK_SIZE := 512 - -BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/common diff --git a/target/product/emulator_system.mk b/target/product/emulator_system.mk deleted file mode 100644 index b7e7cfa19b..0000000000 --- a/target/product/emulator_system.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (C) 2019 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# This file lists emulator experimental modules added to PRODUCT_PACKAGES, -# only included by targets sdk_phone_x86/64 and sdk_gphone_x86/64 - -PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST := \ - system/lib/libemulator_multidisplay_jni.so \ - system/lib64/libemulator_multidisplay_jni.so \ - system/priv-app/MultiDisplayProvider/MultiDisplayProvider.apk \ - -PRODUCT_PACKAGES += MultiDisplayProvider