From 0bf2dc7160383c91553b5cbb5af22486285a9b26 Mon Sep 17 00:00:00 2001 From: jschung Date: Wed, 16 Nov 2022 21:48:43 +0900 Subject: Fix the boot up failure of arm64 target in tm branch. Appplied 64bit only configuration. Bug: 258981848 Test: verified on m1 macbook Change-Id: If2677389e2c42505bb2df89f26f9c512ef381eef (cherry picked from commit 8973c2ac4fbdda1b9baff8fe2854acdb82fc982d) --- emulator_car64_arm64/BoardConfig.mk | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 emulator_car64_arm64/BoardConfig.mk (limited to 'emulator_car64_arm64/BoardConfig.mk') diff --git a/emulator_car64_arm64/BoardConfig.mk b/emulator_car64_arm64/BoardConfig.mk new file mode 100644 index 0000000..6c856b0 --- /dev/null +++ b/emulator_car64_arm64/BoardConfig.mk @@ -0,0 +1,24 @@ +# Copyright (C) 2022 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. +# + +# Use emulator64_arm64 BoardConfig as base +include device/generic/goldfish/emulator64_arm64/BoardConfig.mk +include device/generic/car/emulator/usbpt/BoardConfig.mk + +# Override BOARD_SUPER_PARTITION_SIZE to inclease the mounted system partition. +BOARD_SUPER_PARTITION_SIZE := 5856296960 + +BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE = 3489660928 + -- cgit v1.2.3 From 623619615db3c164dc8834a9c60a6979f38626be Mon Sep 17 00:00:00 2001 From: Marcell Kovacs Date: Sat, 26 Nov 2022 11:28:31 -0800 Subject: Fix kernel modules for arm64 And simplify makefiles by using KERNEL_MODULES_PATH. Bug: 260331376 Test: lunch sdk_gcar_arm64-userdebug && m -j && emulator Test: lunch sdk_gcar_x86_64-userdebug && m -j && emulator Change-Id: I47a9562d3d85d937b9c4fb762f0e3581be548961 --- emulator_car64_arm64/BoardConfig.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'emulator_car64_arm64/BoardConfig.mk') diff --git a/emulator_car64_arm64/BoardConfig.mk b/emulator_car64_arm64/BoardConfig.mk index 6c856b0..607c24f 100644 --- a/emulator_car64_arm64/BoardConfig.mk +++ b/emulator_car64_arm64/BoardConfig.mk @@ -13,6 +13,8 @@ # limitations under the License. # +BOARD_DO_NOT_STRIP_VENDOR_MODULES := true + # Use emulator64_arm64 BoardConfig as base include device/generic/goldfish/emulator64_arm64/BoardConfig.mk include device/generic/car/emulator/usbpt/BoardConfig.mk @@ -21,4 +23,3 @@ include device/generic/car/emulator/usbpt/BoardConfig.mk BOARD_SUPER_PARTITION_SIZE := 5856296960 BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE = 3489660928 - -- cgit v1.2.3