Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c80d801 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add GKI to generic x86_64 board" into sc-dev am: 63383e9d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14636314

Change-Id: I69dbce3554e9606f195d32a991fc42708920413e
parents 318b378f 63383e9d

target/board/generic_x86_64/BoardConfig.mk

+24 −2
Original line number Diff line number Diff line
@@ -24,7 +24,28 @@ TARGET_2ND_ARCH_VARIANT := x86_64 


include build/make/target/board/BoardConfigGsiCommon.mk



ifndef BUILDING_GSI

ifdef BUILDING_GSI

include build/make/target/board/BoardConfigGkiCommon.mk



BOARD_KERNEL-5.4_BOOTIMAGE_PARTITION_SIZE := 67108864

BOARD_KERNEL-5.4-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 67108864

BOARD_KERNEL-5.10_BOOTIMAGE_PARTITION_SIZE := 67108864

BOARD_KERNEL-5.10-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 67108864



BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800



BOARD_KERNEL_BINARIES := \

    kernel-5.4 \

    kernel-5.10 \



ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))

BOARD_KERNEL_BINARIES += \

    kernel-5.4-allsyms \

    kernel-5.10-allsyms \



endif



else # BUILDING_GSI

include build/make/target/board/BoardConfigEmuCommon.mk



BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
@@ -41,4 +62,5 @@ WPA_SUPPLICANT_VERSION := VER_0_8_X 
WIFI_DRIVER_FW_PATH_PARAM   := "/dev/null"

WIFI_DRIVER_FW_PATH_STA     := "/dev/null"

WIFI_DRIVER_FW_PATH_AP      := "/dev/null"

endif
 


endif # BUILDING_GSI

target/board/generic_x86_64/README.txt

+3 −4
Original line number Diff line number Diff line 
The "generic_x86_64" product defines a non-hardware-specific IA target

without a kernel or bootloader.

The "generic_x86_64" product defines a non-hardware-specific x86_64 target

without a bootloader.



It can be used to build the entire user-level system, and

will work with the IA version of the emulator,

It is also the target to build the generic kernel image (GKI).



It is not a product "base class"; no other products inherit

from it or use it in any way.

target/board/generic_x86_64/device.mk

+15 −8
Original line number Diff line number Diff line
@@ -14,14 +14,21 @@ 
# limitations under the License.

#



PRODUCT_SOONG_NAMESPACES += device/generic/goldfish # for libwifi-hal-emu

PRODUCT_SOONG_NAMESPACES += device/generic/goldfish-opengl # for goldfish deps.

PRODUCT_COPY_FILES += \

    kernel/prebuilts/5.4/x86_64/kernel-5.4:kernel-5.4 \

    kernel/prebuilts/5.10/x86_64/kernel-5.10:kernel-5.10 \



$(call dist-for-goals, dist_files, kernel/prebuilts/5.4/x86_64/prebuilt-info.txt:kernel/5.4/prebuilt-info.txt)

$(call dist-for-goals, dist_files, kernel/prebuilts/5.10/x86_64/prebuilt-info.txt:kernel/5.10/prebuilt-info.txt)



ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))

PRODUCT_COPY_FILES += \

    kernel/prebuilts/5.4/x86_64/kernel-5.4:kernel-5.4-allsyms \

    kernel/prebuilts/5.10/x86_64/kernel-5.10:kernel-5.10-allsyms \



ifdef NET_ETH0_STARTONBOOT

  PRODUCT_VENDOR_PROPERTIES += net.eth0.startonboot=1

endif



# Ensure we package the BIOS files too.

PRODUCT_HOST_PACKAGES += \

	bios.bin \

	vgabios-cirrus.bin \
 
PRODUCT_BUILD_VENDOR_BOOT_IMAGE := false

PRODUCT_BUILD_RECOVERY_IMAGE := false



$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk)