diff options
author | Anton Hansson <hansson@google.com> | 2020-12-16 17:52:15 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-12-16 17:52:15 +0000 |
commit | 04a80cd736b69c8419ca43fb939ff54773dc78c2 (patch) | |
tree | e6c601f7a54ee8f8fbaa9a6eb5fe4d16fc0bbf74 | |
parent | a492bde8a329f6d5cce8c2534acbc07493644cf1 (diff) | |
parent | bbd95df172f8712057d93109d3d145624b26f324 (diff) | |
download | build-04a80cd736b69c8419ca43fb939ff54773dc78c2.tar.gz |
Merge "Add devices suitable for single-arch module builds" into mainline-prod
-rw-r--r-- | target/board/module_arm/BoardConfig.mk | 20 | ||||
-rw-r--r-- | target/board/module_arm/README.md | 2 | ||||
-rw-r--r-- | target/board/module_arm/device.mk | 18 | ||||
-rw-r--r-- | target/board/module_arm64/BoardConfig.mk | 25 | ||||
-rw-r--r-- | target/board/module_arm64/README.md | 3 | ||||
-rw-r--r-- | target/board/module_arm64/device.mk | 19 | ||||
-rw-r--r-- | target/board/module_x86/BoardConfig.mk | 18 | ||||
-rw-r--r-- | target/board/module_x86/README.md | 2 | ||||
-rw-r--r-- | target/board/module_x86/device.mk | 18 | ||||
-rw-r--r-- | target/board/module_x86_64/BoardConfig.mk | 22 | ||||
-rw-r--r-- | target/board/module_x86_64/README.md | 3 | ||||
-rw-r--r-- | target/board/module_x86_64/device.mk | 19 |
12 files changed, 169 insertions, 0 deletions
diff --git a/target/board/module_arm/BoardConfig.mk b/target/board/module_arm/BoardConfig.mk new file mode 100644 index 0000000000..565efc8425 --- /dev/null +++ b/target/board/module_arm/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. +# + +TARGET_ARCH := arm +TARGET_ARCH_VARIANT := armv7-a-neon +TARGET_CPU_VARIANT := generic +TARGET_CPU_ABI := armeabi-v7a +TARGET_CPU_ABI2 := armeabi diff --git a/target/board/module_arm/README.md b/target/board/module_arm/README.md new file mode 100644 index 0000000000..b893573bd1 --- /dev/null +++ b/target/board/module_arm/README.md @@ -0,0 +1,2 @@ +This device is suitable for an unbundled module targeted specifically to an arm +device. diff --git a/target/board/module_arm/device.mk b/target/board/module_arm/device.mk new file mode 100644 index 0000000000..7cac5f8430 --- /dev/null +++ b/target/board/module_arm/device.mk @@ -0,0 +1,18 @@ +# +# 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. +# + +$(call inherit-product, build/make/target/product/bootclasspath.mk) +$(call inherit-product, build/make/target/product/languages_default.mk) diff --git a/target/board/module_arm64/BoardConfig.mk b/target/board/module_arm64/BoardConfig.mk new file mode 100644 index 0000000000..66e3792640 --- /dev/null +++ b/target/board/module_arm64/BoardConfig.mk @@ -0,0 +1,25 @@ +# 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. +# + +TARGET_ARCH := arm64 +TARGET_ARCH_VARIANT := armv8-a +TARGET_CPU_VARIANT := generic +TARGET_CPU_ABI := arm64-v8a + +TARGET_2ND_ARCH := arm +TARGET_2ND_ARCH_VARIANT := armv8-a +TARGET_2ND_CPU_ABI := armeabi-v7a +TARGET_2ND_CPU_ABI2 := armeabi +TARGET_2ND_CPU_VARIANT := generic diff --git a/target/board/module_arm64/README.md b/target/board/module_arm64/README.md new file mode 100644 index 0000000000..cb36fbf258 --- /dev/null +++ b/target/board/module_arm64/README.md @@ -0,0 +1,3 @@ +This device is suitable for an unbundled module targeted specifically to an +arm64 device. 32 bit binaries built with this product will not be suitable for a +32-bit arm device. diff --git a/target/board/module_arm64/device.mk b/target/board/module_arm64/device.mk new file mode 100644 index 0000000000..9065d4b66d --- /dev/null +++ b/target/board/module_arm64/device.mk @@ -0,0 +1,19 @@ +# +# 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. +# + +$(call inherit-product, build/make/target/product/bootclasspath.mk) +$(call inherit-product, build/make/target/product/core_64_bit.mk) +$(call inherit-product, build/make/target/product/languages_default.mk) diff --git a/target/board/module_x86/BoardConfig.mk b/target/board/module_x86/BoardConfig.mk new file mode 100644 index 0000000000..af3fffd067 --- /dev/null +++ b/target/board/module_x86/BoardConfig.mk @@ -0,0 +1,18 @@ +# 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. +# + +TARGET_CPU_ABI := x86 +TARGET_ARCH := x86 +TARGET_ARCH_VARIANT := x86 diff --git a/target/board/module_x86/README.md b/target/board/module_x86/README.md new file mode 100644 index 0000000000..10866b7c5f --- /dev/null +++ b/target/board/module_x86/README.md @@ -0,0 +1,2 @@ +This device is suitable for an unbundled module targeted specifically to an +x86 device. diff --git a/target/board/module_x86/device.mk b/target/board/module_x86/device.mk new file mode 100644 index 0000000000..7cac5f8430 --- /dev/null +++ b/target/board/module_x86/device.mk @@ -0,0 +1,18 @@ +# +# 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. +# + +$(call inherit-product, build/make/target/product/bootclasspath.mk) +$(call inherit-product, build/make/target/product/languages_default.mk) diff --git a/target/board/module_x86_64/BoardConfig.mk b/target/board/module_x86_64/BoardConfig.mk new file mode 100644 index 0000000000..1ada02729e --- /dev/null +++ b/target/board/module_x86_64/BoardConfig.mk @@ -0,0 +1,22 @@ +# 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. +# + +TARGET_CPU_ABI := x86_64 +TARGET_ARCH := x86_64 +TARGET_ARCH_VARIANT := x86_64 + +TARGET_2ND_CPU_ABI := x86 +TARGET_2ND_ARCH := x86 +TARGET_2ND_ARCH_VARIANT := x86_64 diff --git a/target/board/module_x86_64/README.md b/target/board/module_x86_64/README.md new file mode 100644 index 0000000000..3377baad2a --- /dev/null +++ b/target/board/module_x86_64/README.md @@ -0,0 +1,3 @@ +This device is suitable for an unbundled module targeted specifically to an +x86_64 device. 32 bit binaries built with this product will not be suitable for +a 32-bit x86 device. diff --git a/target/board/module_x86_64/device.mk b/target/board/module_x86_64/device.mk new file mode 100644 index 0000000000..9065d4b66d --- /dev/null +++ b/target/board/module_x86_64/device.mk @@ -0,0 +1,19 @@ +# +# 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. +# + +$(call inherit-product, build/make/target/product/bootclasspath.mk) +$(call inherit-product, build/make/target/product/core_64_bit.mk) +$(call inherit-product, build/make/target/product/languages_default.mk) |