From 8b9539324ada9385310845e0e3053ee7c50a56ef Mon Sep 17 00:00:00 2001 From: Sam Delmerico Date: Thu, 1 Sep 2022 13:38:00 -0400 Subject: [PATCH] add module_arm64only product 64bit only systems won't load modules with mixed 32/64 binaries. We need a 64bit only product to build with. Bug: 205990590 Test: lunch module_arm64only && m Change-Id: I050a673bfa95978e624e64004089fe7a2b8e0a95 Merged-In: I050a673bfa95978e624e64004089fe7a2b8e0a95 --- target/board/module_arm64only/BoardConfig.mk | 21 +++++++++++++++++++ target/board/module_arm64only/README.md | 2 ++ target/product/module_arm64only.mk | 22 ++++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 target/board/module_arm64only/BoardConfig.mk create mode 100644 target/board/module_arm64only/README.md create mode 100644 target/product/module_arm64only.mk diff --git a/target/board/module_arm64only/BoardConfig.mk b/target/board/module_arm64only/BoardConfig.mk new file mode 100644 index 0000000000..3cabf05d94 --- /dev/null +++ b/target/board/module_arm64only/BoardConfig.mk @@ -0,0 +1,21 @@ +# 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. +# + +include build/make/target/board/BoardConfigModuleCommon.mk + +TARGET_ARCH := arm64 +TARGET_ARCH_VARIANT := armv8-a +TARGET_CPU_VARIANT := generic +TARGET_CPU_ABI := arm64-v8a diff --git a/target/board/module_arm64only/README.md b/target/board/module_arm64only/README.md new file mode 100644 index 0000000000..0dd16992f7 --- /dev/null +++ b/target/board/module_arm64only/README.md @@ -0,0 +1,2 @@ +This device is suitable for an unbundled module targeted specifically to an +arm64 device. 32 bit binaries will not be built. diff --git a/target/product/module_arm64only.mk b/target/product/module_arm64only.mk new file mode 100644 index 0000000000..4e8d53eb75 --- /dev/null +++ b/target/product/module_arm64only.mk @@ -0,0 +1,22 @@ +# +# 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. +# + +$(call inherit-product, $(SRC_TARGET_DIR)/product/module_common.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) + +PRODUCT_NAME := module_arm64only +PRODUCT_BRAND := Android +PRODUCT_DEVICE := module_arm64only