Snap for 10448490 from 3336d5b392db53710801beb3661a0d566ed07065 to simpleperf-release

Change-Id: Ib002d77248801a2b3b71f2083a2a0fb0767401d7

6 files changed, 30 insertions, 77 deletions

diff --git a/art_module/art_module.mk b/art_module/art_module.mk
deleted file mode 100644
index 39bda5b..0000000
--- a/art_module/art_module.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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.
-#
-
-# Enable ART Module top level apex/sdk/module_export modules. When they are
-# enabled the ART Module prebuilts (packages/modules/ArtPrebuilt and
-# prebuilts/module_sdk/art) cannot be present with prefer:true in the build
-# tree.
-# TODO(b/174997203): Clean up the art_module_* products when there is a better
-# way to switch between prebuilts and sources.
-$(call soong_config_set,art_module,source_build,true)
diff --git a/art_module/art_module_arm64.mk b/art_module/art_module_arm64.mk
deleted file mode 100644
index 933d5a6..0000000
--- a/art_module/art_module_arm64.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# 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, $(SRC_TARGET_DIR)/product/module_arm64.mk)
-$(call inherit-product, device/generic/art/art_module/art_module.mk)
-
-PRODUCT_NAME := art_module_arm64
diff --git a/art_module/art_module_x86_64.mk b/art_module/art_module_x86_64.mk
deleted file mode 100644
index d55be8a..0000000
--- a/art_module/art_module_x86_64.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# 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, $(SRC_TARGET_DIR)/product/module_x86_64.mk)
-$(call inherit-product, device/generic/art/art_module/art_module.mk)
-
-PRODUCT_NAME := art_module_x86_64
diff --git a/art_module/AndroidProducts.mk b/riscv64/AndroidProducts.mk
index cb219cb..995ad74 100644
--- a/art_module/AndroidProducts.mk
+++ b/riscv64/AndroidProducts.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 The Android Open Source Project
+# 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.
@@ -15,7 +15,7 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/art_module_arm.mk \
-    $(LOCAL_DIR)/art_module_arm64.mk \
-    $(LOCAL_DIR)/art_module_x86.mk \
-    $(LOCAL_DIR)/art_module_x86_64.mk \
+    $(LOCAL_DIR)/riscv64.mk
+
+COMMON_LUNCH_CHOICES := \
+    riscv64-eng
diff --git a/art_module/art_module_x86.mk b/riscv64/BoardConfig.mk
index 3b4da4c..cb448e9 100644
--- a/art_module/art_module_x86.mk
+++ b/riscv64/BoardConfig.mk
@@ -1,5 +1,5 @@
-#
-# Copyright (C) 2020 The Android Open Source Project
+
+# 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.
@@ -14,7 +14,15 @@
 # limitations under the License.
 #
 
-$(call inherit-product, $(SRC_TARGET_DIR)/product/module_x86.mk)
-$(call inherit-product, device/generic/art/art_module/art_module.mk)
+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
 
-PRODUCT_NAME := art_module_x86
+# Temporary hack while prebuilt modules are missing riscv64.
+ALLOW_MISSING_DEPENDENCIES := true
diff --git a/art_module/art_module_arm.mk b/riscv64/riscv64.mk
index 2811bf1..47e824e 100644
--- a/art_module/art_module_arm.mk
+++ b/riscv64/riscv64.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 The Android Open Source Project
+# 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.
@@ -14,7 +14,15 @@
 # limitations under the License.
 #
 
-$(call inherit-product, $(SRC_TARGET_DIR)/product/module_arm.mk)
-$(call inherit-product, device/generic/art/art_module/art_module.mk)
+PRODUCT_COPY_FILES += \
+    art/tools/public.libraries.buildbot.txt:system/etc/public.libraries.txt
 
-PRODUCT_NAME := art_module_arm
+$(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