Merge "Update build rule for vts driver."
diff --git a/audio/V2_0/target/AndroidTest.xml b/audio/V2_0/target/AndroidTest.xml
index 2cb4377..e84bf69 100644
--- a/audio/V2_0/target/AndroidTest.xml
+++ b/audio/V2_0/target/AndroidTest.xml
@@ -17,6 +17,7 @@
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
<option name="abort-on-push-failure" value="false"/>
<option name="push-group" value="HalHidlTargetTest.push"/>
+ <option name="push" value="DATA/hardware/interfaces/audio/2.0/config/audio_policy_configuration.xsd->/data/local/tmp/audio_policy_configuration.xsd"/>
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
diff --git a/treble/vintf/vts_treble_vintf_test.cpp b/treble/vintf/vts_treble_vintf_test.cpp
index ceff9b9..217708a 100644
--- a/treble/vintf/vts_treble_vintf_test.cpp
+++ b/treble/vintf/vts_treble_vintf_test.cpp
@@ -110,8 +110,8 @@
<< "Failed to get passthrough service manager." << endl;
vendor_manifest_ = ::android::vintf::VintfObject::GetDeviceHalManifest();
- ASSERT_NE(passthrough_manager_, nullptr)
- << "Failed to get vendor HAL manifest." << endl;
+ ASSERT_NE(vendor_manifest_, nullptr) << "Failed to get vendor HAL manifest."
+ << endl;
}
// Applies given function to each HAL instance in VINTF.