From 85f5c34e0a1dd0c382f3fe33734e3626b65ee4d8 Mon Sep 17 00:00:00 2001 From: Nelson Li Date: Mon, 25 Mar 2024 08:39:08 +0000 Subject: [PATCH] Move berberis tests to build/core/tasks Move the executes `berberis_host_tests_result` and `berberis_run_host_tests` to `build/core/tasks`, as Soong might currently have difficulty supporting this part. Set the OWNER of berberis_test.mk Bug: 321643544 Test: 1. lunch sdk_phone64_x86_64_riscv64-trunk_staging-eng 2. m berberis_all 3. m berberis_host_tests_result 4. m berberis_run_host_tests Change-Id: I44a03e9eae9ee6a3c82a6d2e6de3a03b2c7d81da --- core/OWNERS | 3 +++ core/tasks/berberis_test.mk | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 core/tasks/berberis_test.mk diff --git a/core/OWNERS b/core/OWNERS index 36951a9589..1c3d017ef8 100644 --- a/core/OWNERS +++ b/core/OWNERS @@ -10,3 +10,6 @@ per-file version_defaults.mk = amhk@google.com,gurpreetgs@google.com,mkhokhlova@ # For Ravenwood test configs per-file ravenwood_test_config_template.xml = jsharkey@google.com,omakoto@google.com + +# For binary_translation +per-file berberis_test.mk = levarum@google.com,khim@google.com,dimitry@google.com diff --git a/core/tasks/berberis_test.mk b/core/tasks/berberis_test.mk new file mode 100644 index 0000000000..860470980d --- /dev/null +++ b/core/tasks/berberis_test.mk @@ -0,0 +1,25 @@ +# +# 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. +# + +BERBERIS_DIR := frameworks/libs/binary_translation + +# Berberis includes some components which may conflict with other packages. +# Only build it when requested explicitly. +ifeq ($(BUILD_BERBERIS),true) + +include $(BERBERIS_DIR)/tests/run_host_tests.mk + +endif # BUILD_BERBERIS