diff options
| author | Sam Delmerico <delmerico@google.com> | 2022-09-01 14:50:01 -0400 |
|---|---|---|
| committer | Sam Delmerico <delmerico@google.com> | 2022-09-01 22:55:25 +0000 |
| commit | f7ee62d73da2991ebbdd4795eb7753e3107306f8 (patch) | |
| tree | 0bb58a92fe0f4dae1a2ea053ea4a2e820fa17213 | |
| parent | 79f29a076e6353e5fe17bb19c899d37b191d9b62 (diff) | |
| download | build-f7ee62d73da2991ebbdd4795eb7753e3107306f8.tar.gz | |
add module_x86_64only 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_x86_64only && m
Test: vendor/google/build/build_mainline_modules.sh
Change-Id: I906f6cd10882986c8182ed16916e07c0f0d8b32e
| -rw-r--r-- | target/board/module_x86_64only/BoardConfig.mk | 20 | ||||
| -rw-r--r-- | target/board/module_x86_64only/README.md | 2 | ||||
| -rw-r--r-- | target/product/module_x86_64only.mk | 22 |
3 files changed, 44 insertions, 0 deletions
diff --git a/target/board/module_x86_64only/BoardConfig.mk b/target/board/module_x86_64only/BoardConfig.mk new file mode 100644 index 0000000000..b0676cbe22 --- /dev/null +++ b/target/board/module_x86_64only/BoardConfig.mk @@ -0,0 +1,20 @@ +# 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. +# + +include build/make/target/board/BoardConfigModuleCommon.mk + +TARGET_CPU_ABI := x86_64 +TARGET_ARCH := x86_64 +TARGET_ARCH_VARIANT := x86_64 diff --git a/target/board/module_x86_64only/README.md b/target/board/module_x86_64only/README.md new file mode 100644 index 0000000000..8fd7dc4757 --- /dev/null +++ b/target/board/module_x86_64only/README.md @@ -0,0 +1,2 @@ +This device is suitable for an unbundled module targeted specifically to an +x86_64 device. 32 bit binaries will not be built. diff --git a/target/product/module_x86_64only.mk b/target/product/module_x86_64only.mk new file mode 100644 index 0000000000..bca4541efe --- /dev/null +++ b/target/product/module_x86_64only.mk @@ -0,0 +1,22 @@ +# +# Copyright (C) 2021 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_x86_64only +PRODUCT_BRAND := Android +PRODUCT_DEVICE := module_x86_64only |