summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Geoffray <ngeoffray@google.com>2020-01-12 14:05:32 -0800
committerandroid-build-merger <android-build-merger@google.com>2020-01-12 14:05:32 -0800
commit265b324fa614b5400028f19ffebe61b6cd3a28d3 (patch)
tree4dfff2afba3f1b1a3b4001fe72101d00bdd43dc9
parent5540928068a9bab050f85d778a6cabf808e3cca1 (diff)
parent211a6845fb7e1fe28b872f1b59629456c18a6417 (diff)
downloadart-265b324fa614b5400028f19ffebe61b6cd3a28d3.tar.gz
Add a new minimal device configuration for arm32/arm64 combo.
am: 211a6845fb Change-Id: Iaf04e0a7101c1c6e24f0bb1a9924242660a2a829
-rw-r--r--arm_v7_v8/AndroidProducts.mk21
-rw-r--r--arm_v7_v8/BoardConfig.mk35
-rw-r--r--arm_v7_v8/arm_v7_v8.mk22
-rw-r--r--arm_v7_v8/vendorsetup.sh17
4 files changed, 95 insertions, 0 deletions
diff --git a/arm_v7_v8/AndroidProducts.mk b/arm_v7_v8/AndroidProducts.mk
new file mode 100644
index 0000000..931c274
--- /dev/null
+++ b/arm_v7_v8/AndroidProducts.mk
@@ -0,0 +1,21 @@
+#
+# Copyright (C) 2017 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.
+#
+
+# A small device description to get the required ART binaries
+# built for a duo 32 and 64 bit ARM processor.
+
+PRODUCT_MAKEFILES := \
+ $(LOCAL_DIR)/arm_v7_v8.mk
diff --git a/arm_v7_v8/BoardConfig.mk b/arm_v7_v8/BoardConfig.mk
new file mode 100644
index 0000000..dc63b70
--- /dev/null
+++ b/arm_v7_v8/BoardConfig.mk
@@ -0,0 +1,35 @@
+
+# Copyright (C) 2017 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_NO_BOOTLOADER := true
+TARGET_NO_KERNEL := true
+TARGET_ARCH := arm64
+
+TARGET_CPU_ABI := arm64-v8a
+TARGET_CPU_SMP := true
+TARGET_CPU_VARIANT := generic
+TARGET_ARCH_VARIANT := armv8-a
+
+TARGET_2ND_ARCH := arm
+TARGET_2ND_ARCH_VARIANT := armv7-a-neon
+TARGET_2ND_CPU_VARIANT := cortex-a15
+TARGET_2ND_CPU_ABI := armeabi-v7a
+TARGET_2ND_CPU_ABI2 := armeabi
+
+TARGET_SUPPORTS_32_BIT_APPS := true
+TARGET_SUPPORTS_64_BIT_APPS := true
+
+USE_CLANG_PLATFORM_BUILD := true
diff --git a/arm_v7_v8/arm_v7_v8.mk b/arm_v7_v8/arm_v7_v8.mk
new file mode 100644
index 0000000..8c1d293
--- /dev/null
+++ b/arm_v7_v8/arm_v7_v8.mk
@@ -0,0 +1,22 @@
+#
+# Copyright (C) 2017 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/target/product/core_base.mk)
+
+PRODUCT_NAME := arm_v7_v8
+PRODUCT_DEVICE := arm_v7_v8
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := ARM v7 and v8
diff --git a/arm_v7_v8/vendorsetup.sh b/arm_v7_v8/vendorsetup.sh
new file mode 100644
index 0000000..6b0fcf0
--- /dev/null
+++ b/arm_v7_v8/vendorsetup.sh
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2017 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.
+#
+
+add_lunch_combo arm_v7_v8-eng