Merge "Add riscv64 lunch target." am: 3336d5b392 am: 67dd1a41f9 am: 2aa77aaa07 am: edbb686231 am: 7fe99936c9

Original change: https://android-review.googlesource.com/c/device/generic/art/+/2622170

Change-Id: I2e446ed2986a8f2406052588d75a93f3edf24d81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3 files changed, 77 insertions, 0 deletions

diff --git a/riscv64/AndroidProducts.mk b/riscv64/AndroidProducts.mk
new file mode 100644
index 0000000..995ad74
--- /dev/null
+++ b/riscv64/AndroidProducts.mk
@@ -0,0 +1,21 @@
+#
+# Copyright (C) 2023 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.
+#
+
+PRODUCT_MAKEFILES := \
+    $(LOCAL_DIR)/riscv64.mk
+
+COMMON_LUNCH_CHOICES := \
+    riscv64-eng
diff --git a/riscv64/BoardConfig.mk b/riscv64/BoardConfig.mk
new file mode 100644
index 0000000..cb448e9
--- /dev/null
+++ b/riscv64/BoardConfig.mk
@@ -0,0 +1,28 @@
+
+# Copyright (C) 2023 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 device/generic/art/BoardConfigCommon.mk
+
+TARGET_ARCH := riscv64
+
+TARGET_CPU_ABI := riscv64
+TARGET_CPU_VARIANT := generic
+TARGET_ARCH_VARIANT :=
+
+TARGET_SUPPORTS_64_BIT_APPS := true
+
+# Temporary hack while prebuilt modules are missing riscv64.
+ALLOW_MISSING_DEPENDENCIES := true
diff --git a/riscv64/riscv64.mk b/riscv64/riscv64.mk
new file mode 100644
index 0000000..47e824e
--- /dev/null
+++ b/riscv64/riscv64.mk
@@ -0,0 +1,28 @@
+#
+# Copyright (C) 2023 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.
+#
+
+PRODUCT_COPY_FILES += \
+    art/tools/public.libraries.buildbot.txt:system/etc/public.libraries.txt
+
+$(call inherit-product, build/target/product/core_minimal.mk)
+
+PRODUCT_NAME := riscv64
+PRODUCT_DEVICE := riscv64
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := RISCV64
+
+# Force 64bits executables.
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64