Merge "Add an aosp target that supports 64-bit app only" am: f5941dae am: 9ad93982

# 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.

#

# x86_64 emulator specific definitions

TARGET_CPU_ABI := x86_64

TARGET_ARCH := x86_64

TARGET_ARCH_VARIANT := x86_64

# Keep the following for 32-bit native code support

# There are a few native services still on 32-bit modes, e.g. media & audio.

# Remove them in S.

TARGET_2ND_CPU_ABI := x86

TARGET_2ND_ARCH := x86

TARGET_2ND_ARCH_VARIANT := x86_64

TARGET_PRELINK_MODULE := false

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

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

BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800

BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/x86

# 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"

The "generic_x86_64_app" product defines a non-hardware-specific IA target

without a kernel or bootloader.

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

will work with the IA version of the emulator,

This supports 64-bit apps only.

#

# 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.

#

ifdef NET_ETH0_STARTONBOOT

  PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1

endif

# Ensure we package the BIOS files too.

PRODUCT_HOST_PACKAGES += \

    bios.bin \

    vgabios-cirrus.bin \

#

# system.prop for generic sdk

#

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

else

PRODUCT_MAKEFILES := \

    $(LOCAL_DIR)/aosp_64bitonly_x86_64.mk \

    $(LOCAL_DIR)/aosp_arm64_ab.mk \

    $(LOCAL_DIR)/aosp_arm64.mk \

    $(LOCAL_DIR)/aosp_arm_ab.mk \