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

Commit 04735a8e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I465ea6c9,I57b77d7c,I536a286d,Ie16a7bf7 into rvc-dev 

* changes:
  generate multiple boot.img files in aosp_arm64
  create emulator_arm64 device for sdk_phone_arm64 to use
  support multiple boot.img files in release tools
  multi boot.img support cleanups
parents c0f3be13 4b6b2003

core/Makefile

+9 −4
Original line number Original line Diff line number Diff line
@@ -2080,8 +2080,7 @@ $(INSTALLED_RECOVERY_BUILD_PROP_TARGET): \ 
	$(call append-recovery-ui-properties,$(PRIVATE_RECOVERY_UI_PROPERTIES),$@)

	$(call append-recovery-ui-properties,$(PRIVATE_RECOVERY_UI_PROPERTIES),$@)





ifeq (truetrue,$(strip $(BUILDING_VENDOR_BOOT_IMAGE))$(strip $(AB_OTA_UPDATER)))

ifeq (truetrue,$(strip $(BUILDING_VENDOR_BOOT_IMAGE))$(strip $(AB_OTA_UPDATER)))

  INTERNAL_RECOVERYIMAGE_ARGS := \

  INTERNAL_RECOVERYIMAGE_ARGS := --ramdisk $(recovery_ramdisk)

      --kernel $(recovery_kernel) --ramdisk $(recovery_ramdisk)

ifdef GENERIC_KERNEL_CMDLINE

ifdef GENERIC_KERNEL_CMDLINE

  INTERNAL_RECOVERYIMAGE_ARGS += --cmdline "$(GENERIC_KERNEL_CMDLINE)"

  INTERNAL_RECOVERYIMAGE_ARGS += --cmdline "$(GENERIC_KERNEL_CMDLINE)"

endif

endif
@@ -2158,10 +2157,10 @@ $(recovery_ramdisk): $(MKBOOTFS) $(MINIGZIP) \ 
# $(2): kernel file

# $(2): kernel file

define build-recoveryimage-target

define build-recoveryimage-target

  $(if $(filter true,$(PRODUCT_SUPPORTS_VBOOT)), \

  $(if $(filter true,$(PRODUCT_SUPPORTS_VBOOT)), \

    $(MKBOOTIMG) --kernel $(2) $(MKBOOTIMG_KERNEL_ARG) $(INTERNAL_RECOVERYIMAGE_ARGS) \

    $(MKBOOTIMG) --kernel $(2) $(INTERNAL_RECOVERYIMAGE_ARGS) \

                 $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_RECOVERY_MKBOOTIMG_ARGS) \

                 $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_RECOVERY_MKBOOTIMG_ARGS) \

                 --output $(1).unsigned, \

                 --output $(1).unsigned, \

    $(MKBOOTIMG) --kernel $(2) $(MKBOOTIMG_KERNEL_ARG) $(INTERNAL_RECOVERYIMAGE_ARGS) \

    $(MKBOOTIMG) --kernel $(2) $(INTERNAL_RECOVERYIMAGE_ARGS) \

                 $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_RECOVERY_MKBOOTIMG_ARGS) \

                 $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_RECOVERY_MKBOOTIMG_ARGS) \

                 --output $(1))

                 --output $(1))

  $(if $(filter true,$(PRODUCT_SUPPORTS_BOOT_SIGNER)),\

  $(if $(filter true,$(PRODUCT_SUPPORTS_BOOT_SIGNER)),\
@@ -3472,8 +3471,12 @@ $(if $(BOARD_AVB_$(call to-upper,$(1))_KEY_PATH),\ 
endef

endef





ifdef INSTALLED_BOOTIMAGE_TARGET

ifdef INSTALLED_BOOTIMAGE_TARGET

# multiple hashes for an image are not yet supported, fortunately this

# only arises for GKI where the boot descriptor can be left out

ifeq ($(strip $(BOARD_KERNEL_BINARIES)),)

$(eval $(call check-and-set-avb-args,boot))

$(eval $(call check-and-set-avb-args,boot))

endif

endif

endif





ifdef INSTALLED_VENDOR_BOOTIMAGE_TARGET

ifdef INSTALLED_VENDOR_BOOTIMAGE_TARGET

$(eval $(call check-and-set-avb-args,vendor_boot))

$(eval $(call check-and-set-avb-args,vendor_boot))
@@ -4128,6 +4131,8 @@ ifdef BOARD_BOOTIMAGE_PARTITION_SIZE 
endif

endif

ifeq ($(INSTALLED_BOOTIMAGE_TARGET),)

ifeq ($(INSTALLED_BOOTIMAGE_TARGET),)

	$(hide) echo "no_boot=true" >> $@

	$(hide) echo "no_boot=true" >> $@

else

	echo "boot_images=$(foreach b,$(INSTALLED_BOOTIMAGE_TARGET),$(notdir $(b)))" >> $@

endif

endif

ifneq ($(INSTALLED_VENDOR_BOOTIMAGE_TARGET),)

ifneq ($(INSTALLED_VENDOR_BOOTIMAGE_TARGET),)

	echo "vendor_boot=true" >> $@

	echo "vendor_boot=true" >> $@

target/board/emulator_arm64/BoardConfig.mk

0 → 100644
+77 −0
Original line number Original line Diff line number Diff line 
# Copyright (C) 2020 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.

#



# arm64 emulator specific definitions

TARGET_ARCH := arm64

TARGET_ARCH_VARIANT := armv8-a

TARGET_CPU_VARIANT := generic

TARGET_CPU_ABI := arm64-v8a



TARGET_2ND_ARCH := arm

TARGET_2ND_CPU_ABI := armeabi-v7a

TARGET_2ND_CPU_ABI2 := armeabi



ifneq ($(TARGET_BUILD_APPS)$(filter cts sdk vts10,$(MAKECMDGOALS)),)

# DO NOT USE

# DO NOT USE

#

# This architecture / CPU variant must NOT be used for any 64 bit

# platform builds. It is the lowest common denominator required

# to build an unbundled application or cts for all supported 32 and 64 bit

# platforms.

#

# If you're building a 64 bit platform (and not an application) the

# ARM-v8 specification allows you to assume all the features available in an

# armv7-a-neon CPU. You should set the following as 2nd arch/cpu variant:

#

# TARGET_2ND_ARCH_VARIANT := armv8-a

# TARGET_2ND_CPU_VARIANT := generic

#

# DO NOT USE

# DO NOT USE

TARGET_2ND_ARCH_VARIANT := armv7-a-neon

# DO NOT USE

# DO NOT USE

TARGET_2ND_CPU_VARIANT := generic

# DO NOT USE

# DO NOT USE

else

TARGET_2ND_ARCH_VARIANT := armv8-a

TARGET_2ND_CPU_VARIANT := generic

endif



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

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



TARGET_NO_KERNEL := false

TARGET_NO_VENDOR_BOOT := false

BOARD_USES_RECOVERY_AS_BOOT := true



BOARD_BOOTIMAGE_PARTITION_SIZE := 0x02000000

BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800



BOARD_BOOT_HEADER_VERSION := 3

BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)



# Wifi.

BOARD_WLAN_DEVICE           := emulator

BOARD_HOSTAPD_DRIVER        := NL80211

BOARD_WPA_SUPPLICANT_DRIVER := NL80211

BOARD_HOSTAPD_PRIVATE_LIB   := lib_driver_cmd_simulated

BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_simulated

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"

target/board/emulator_arm64/device.mk

0 → 100644
+29 −0
Original line number Original line Diff line number Diff line 
#

# Copyright (C) 2020 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.

#



# Cuttlefish has GKI kernel prebuilts, so use those for the GKI boot.img.

ifeq ($(TARGET_PREBUILT_KERNEL),)

    LOCAL_KERNEL := device/google/cuttlefish_kernel/5.4-arm64/kernel

else

    LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)

endif



PRODUCT_COPY_FILES += \

    $(LOCAL_KERNEL):kernel



# Adjust the Dalvik heap to be appropriate for a tablet.

$(call inherit-product-if-exists, frameworks/base/build/tablet-dalvik-heap.mk)

$(call inherit-product-if-exists, frameworks/native/build/tablet-dalvik-heap.mk)

target/board/emulator_arm64/system_ext.prop

0 → 100644
+5 −0
Original line number Original line Diff line number Diff line 
#

# system.prop for emulator arm64 sdk

#



rild.libpath=/vendor/lib64/libreference-ril.so

target/board/generic_arm64/BoardConfig.mk

+5 −15
Original line number Original line Diff line number Diff line
@@ -53,20 +53,21 @@ TARGET_2ND_CPU_VARIANT := generic 
endif

endif





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

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

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





TARGET_NO_KERNEL := false

TARGET_NO_KERNEL := false

TARGET_NO_VENDOR_BOOT := true

TARGET_NO_VENDOR_BOOT := true

BOARD_USES_RECOVERY_AS_BOOT := true

BOARD_USES_RECOVERY_AS_BOOT := true





BOARD_BOOTIMAGE_PARTITION_SIZE := 0x02000000

BOARD_BOOTIMAGE_PARTITION_SIZE := 0x04000000

BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800

BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800





BOARD_BOOT_HEADER_VERSION := 3

BOARD_BOOT_HEADER_VERSION := 3

BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)

BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)





# Emulator system image is going to be used as GSI and some vendor still hasn't

BOARD_KERNEL_BINARIES := kernel-5.4 kernel-5.4-gz kernel-5.4-lz4

# cleaned up all device specific directories under root!



# Some vendors still haven't cleaned up all device specific directories under

# root!





# TODO(b/111434759, b/111287060) SoC specific hacks

# TODO(b/111434759, b/111287060) SoC specific hacks

BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp

BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp
@@ -76,14 +77,3 @@ BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt:/firmware 
# TODO(b/36764215): remove this setting when the generic system image

# TODO(b/36764215): remove this setting when the generic system image

# no longer has QCOM-specific directories under /.

# no longer has QCOM-specific directories under /.

BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64/sepolicy
 
BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64/sepolicy
 


# Wifi.

BOARD_WLAN_DEVICE           := emulator

BOARD_HOSTAPD_DRIVER        := NL80211

BOARD_WPA_SUPPLICANT_DRIVER := NL80211

BOARD_HOSTAPD_PRIVATE_LIB   := lib_driver_cmd_simulated

BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_simulated

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"