From 39c684a71cb32087b86e24be88bd11570f7356c4 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <zhangkelvin@google.com>
Date: Thu, 4 Aug 2022 10:05:43 -0700
Subject: Fix misconfigured recovery host test

Test: atest recovery_host_test
Bug: 241353143
Change-Id: I13bb9595745f65a63070cf9fe030c9155f75e4d0
(cherry picked from commit 9ce95441b255cec017bf4080f61ddd0b41628f3f)
Merged-In: I13bb9595745f65a63070cf9fe030c9155f75e4d0
---
 tests/Android.bp           |  1 +
 tests/AndroidTest.xml      | 28 ----------------------------
 tests/RecoveryHostTest.xml | 28 ++++++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 28 deletions(-)
 delete mode 100644 tests/AndroidTest.xml
 create mode 100644 tests/RecoveryHostTest.xml

diff --git a/tests/Android.bp b/tests/Android.bp
index 9ad3d3b80..0708e855a 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -216,6 +216,7 @@ cc_test_host {
     ],
 
     test_suites: ["general-tests"],
+    test_config: "RecoveryHostTest.xml",
 
     data: ["testdata/*"],
 
diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
deleted file mode 100644
index 0ac75e4ea..000000000
--- a/tests/AndroidTest.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-<configuration description="Runs recovery_host_test.">
-    <option name="null-device" value="true" />
-
-    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer">
-        <option name="force-root" value="false" />
-    </target_preparer>
-    <option name="not-shardable" value="true" />
-
-    <test class="com.android.tradefed.testtype.HostGTest" >
-        <option name="module-name" value="recovery_host_test" />
-        <option name="native-test-timeout" value="5m"/>
-    </test>
-</configuration>
diff --git a/tests/RecoveryHostTest.xml b/tests/RecoveryHostTest.xml
new file mode 100644
index 000000000..0ac75e4ea
--- /dev/null
+++ b/tests/RecoveryHostTest.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+<configuration description="Runs recovery_host_test.">
+    <option name="null-device" value="true" />
+
+    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer">
+        <option name="force-root" value="false" />
+    </target_preparer>
+    <option name="not-shardable" value="true" />
+
+    <test class="com.android.tradefed.testtype.HostGTest" >
+        <option name="module-name" value="recovery_host_test" />
+        <option name="native-test-timeout" value="5m"/>
+    </test>
+</configuration>
-- 
cgit v1.2.3


From 6f68964a57200284eb209951dbef511b7c614844 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <zhangkelvin@google.com>
Date: Tue, 30 Aug 2022 00:24:40 +0000
Subject: Make libbootloader_message available in recovery

Test: th
Bug: 227536004
Change-Id: Ie40045963c5493d8fbc1eb15e6a54ecaf1c4728f
---
 bootloader_message/Android.bp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bootloader_message/Android.bp b/bootloader_message/Android.bp
index 778fdb93e..76226773e 100644
--- a/bootloader_message/Android.bp
+++ b/bootloader_message/Android.bp
@@ -45,6 +45,7 @@ cc_library {
         "libbootloader_message_defaults",
     ],
     recovery_available: true,
+    vendor_available: true,
     host_supported: true,
 
     target: {
-- 
cgit v1.2.3