Merge changes from topic "b/129002747" am: dddf40a7f5
am: 220fcf241a
Change-Id: Ia5bdbdb017c6490afdd9db7cf59a1c0f7f86bbbb
This commit is contained in:
commit
50299c1aeb
4 changed files with 106 additions and 0 deletions
22
fs_mgr/libdm/Android.mk
Normal file
22
fs_mgr/libdm/Android.mk
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
#
|
||||
# Copyright (C) 2018 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.
|
||||
#
|
||||
|
||||
LOCAL_PATH := $(call my-dir)
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_MODULE := VtsKernelLibdmTest
|
||||
include test/vts/tools/build/Android.host_config.mk
|
||||
31
fs_mgr/libdm/AndroidTest.xml
Normal file
31
fs_mgr/libdm/AndroidTest.xml
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2019 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="Config for VTS VtsKernelLibdmTest">
|
||||
<option name="config-descriptor:metadata" key="plan" value="vts-kernel" />
|
||||
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
|
||||
<option name="abort-on-push-failure" value="false"/>
|
||||
<option name="push-group" value="HostDrivenTest.push"/>
|
||||
</target_preparer>
|
||||
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
|
||||
<option name="test-module-name" value="VtsKernelLibdmTest"/>
|
||||
<option name="binary-test-source" value="_32bit::DATA/nativetest/libdm_test/libdm_test" />
|
||||
<option name="binary-test-source" value="_64bit::DATA/nativetest64/libdm_test/libdm_test" />
|
||||
<option name="binary-test-type" value="gtest"/>
|
||||
<option name="test-timeout" value="1m"/>
|
||||
<option name="precondition-first-api-level" value="29" />
|
||||
</test>
|
||||
</configuration>
|
||||
|
||||
22
fs_mgr/liblp/Android.mk
Normal file
22
fs_mgr/liblp/Android.mk
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
#
|
||||
# Copyright (C) 2018 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.
|
||||
#
|
||||
|
||||
LOCAL_PATH := $(call my-dir)
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_MODULE := VtsKernelLiblpTest
|
||||
include test/vts/tools/build/Android.host_config.mk
|
||||
31
fs_mgr/liblp/AndroidTest.xml
Normal file
31
fs_mgr/liblp/AndroidTest.xml
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2019 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="Config for VTS VtsKernelLiblpTest">
|
||||
<option name="config-descriptor:metadata" key="plan" value="vts-kernel" />
|
||||
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
|
||||
<option name="abort-on-push-failure" value="false"/>
|
||||
<option name="push-group" value="HostDrivenTest.push"/>
|
||||
</target_preparer>
|
||||
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
|
||||
<option name="test-module-name" value="VtsKernelLiblpTest"/>
|
||||
<option name="binary-test-source" value="_32bit::DATA/nativetest/liblp_test/liblp_test" />
|
||||
<option name="binary-test-source" value="_64bit::DATA/nativetest64/liblp_test/liblp_test" />
|
||||
<option name="binary-test-type" value="gtest"/>
|
||||
<option name="test-timeout" value="1m"/>
|
||||
<option name="precondition-first-api-level" value="29" />
|
||||
</test>
|
||||
</configuration>
|
||||
|
||||
Loading…
Add table
Reference in a new issue