Snap for 6405781 from 1a0ca7b15ef06d64f10184131fc5ffa50cd12746 to sdk-release
Change-Id: I1c4e7876890d6c127d75b481131380d3cde068ee
diff --git a/AndroidTest.xml b/AndroidTest.xml
deleted file mode 100644
index e9805b7..0000000
--- a/AndroidTest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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 BoringSSL device tests">
- <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
- <option name="cleanup" value="true" />
- <option name="push" value="boringssl_ssl_test->/data/local/tmp/boringssl_ssl_test" />
- <option name="push" value="boringssl_crypto_test->/data/local/tmp/boringssl_crypto_test" />
- </target_preparer>
- <option name="test-suite-tag" value="apct" />
- <test class="com.android.tradefed.testtype.GTest" >
- <option name="native-test-device-path" value="/data/local/tmp/boringssl_ssl_test" />
- <option name="module-name" value="boringssl_ssl_test" />
- </test>
- <test class="com.android.tradefed.testtype.GTest" >
- <option name="native-test-device-path" value="/data/local/tmp/boringssl_crypto_test" />
- <option name="module-name" value="boringssl_crypto_test" />
- </test>
-</configuration>
diff --git a/selftest/Android.bp b/selftest/Android.bp
index dbd52f8..86a6bdb 100644
--- a/selftest/Android.bp
+++ b/selftest/Android.bp
@@ -40,6 +40,10 @@
"//external/conscrypt/apex/testing",
],
defaults: ["boringssl_self_test_defaults"],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.conscrypt",
+ ],
}
cc_binary {
