StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add GKI to generic x86_64 board

Browse Source 
- Remove emulator configurations from generic_x86_64/device.mk.
- Add GKI configurations to generic_x86_64/device.mk.

Test: lunch gsi_x86_64-userdebug ; make dist
Bug: 181277965
Change-Id: I43c8005afcaeec6ed70648b5f74eeed1d46f9228
Merged-In: I43c8005afcaeec6ed70648b5f74eeed1d46f9228
(cherry picked from commit b212b0a92a)
This commit is contained in:
Hsin-Yi Chen
2021-05-08 15:23:44 +08:00
parent dea57a49e2
commit 6968d4dc9c
3 changed files with 42 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
target/board/generic_x86_64/BoardConfig.mk
View File

@@ -24,7 +24,28 @@ TARGET_2ND_ARCH_VARIANT := x86_64
include build/make/target/board/BoardConfigGsiCommon.mk 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 include build/make/target/board/BoardConfigEmuCommon.mk
BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800 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_PARAM := "/dev/null"
WIFI_DRIVER_FW_PATH_STA := "/dev/null" WIFI_DRIVER_FW_PATH_STA := "/dev/null"
WIFI_DRIVER_FW_PATH_AP := "/dev/null" WIFI_DRIVER_FW_PATH_AP := "/dev/null"
endif
endif # BUILDING_GSI

7
target/board/generic_x86_64/README.txt
View File

@@ -1,8 +1,7 @@
The "generic_x86_64" product defines a non-hardware-specific IA target The "generic_x86_64" product defines a non-hardware-specific x86_64 target
without a kernel or bootloader. without a bootloader.
It can be used to build the entire user-level system, and It is also the target to build the generic kernel image (GKI).
will work with the IA version of the emulator,
It is not a product "base class"; no other products inherit It is not a product "base class"; no other products inherit
from it or use it in any way. from it or use it in any way.

23
target/board/generic_x86_64/device.mk
View File

@@ -14,14 +14,21 @@
# limitations under the License. # limitations under the License.
# #
PRODUCT_SOONG_NAMESPACES += device/generic/goldfish # for libwifi-hal-emu PRODUCT_COPY_FILES += \
PRODUCT_SOONG_NAMESPACES += device/generic/goldfish-opengl # for goldfish deps. 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 endif
# Ensure we package the BIOS files too. PRODUCT_BUILD_VENDOR_BOOT_IMAGE := false
PRODUCT_HOST_PACKAGES += \ PRODUCT_BUILD_RECOVERY_IMAGE := false
bios.bin \
vgabios-cirrus.bin \ $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk)