diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-09-08 13:36:17 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-09-08 13:36:17 +0000 |
commit | dc614caaad677986e56fba9f1141666f8ab61c07 (patch) | |
tree | 288a0f9bac2a17aeaef43fa838cd1c5a4dabffd8 | |
parent | fb7b93c35745d28c4561098d82f8d3a42090fa26 (diff) | |
parent | d58084b674464d8e5095b3f62edcb11115abfe3b (diff) | |
download | cbor-java-android13-mainline-go-sdkext-release.tar.gz |
Snap for 8756029 from d58084b674464d8e5095b3f62edcb11115abfe3b to mainline-go-sdkext-releaseaml_go_sdk_330810000android13-mainline-go-sdkext-release
Change-Id: I4e6512b19326254d909b0d6cac78c73ec4a16b91
-rw-r--r-- | Android.bp | 30 | ||||
-rw-r--r-- | AndroidManifest.xml | 27 | ||||
-rw-r--r-- | AndroidTest.xml | 29 | ||||
-rw-r--r-- | LICENSE | 14 | ||||
-rw-r--r-- | TEST_MAPPING | 8 |
5 files changed, 1 insertions, 107 deletions
@@ -37,34 +37,6 @@ java_library { srcs: [ "src/main/**/*.java", ], - min_sdk_version: "30", - sdk_version: "core_current", - apex_available: [ - "//apex_available:platform", - "com.android.adservices", - ], -} -android_test { - name: "CborJavaTestCases", - srcs: [ - "src/test/**/*.java", - ], - static_libs: [ - "androidx.test.rules", - "cbor-java", - ], - libs: [ - "android.test.base", - ], - test_mainline_modules: [ - "com.google.android.adservices.apex" - ], - min_sdk_version: "30", - sdk_version: "test_current", - test_suites: [ - "general-tests", - "mts-adservices", - ], - visibility: ["//visibility:private"], + sdk_version: "core_current", } diff --git a/AndroidManifest.xml b/AndroidManifest.xml deleted file mode 100644 index 5009bad..0000000 --- a/AndroidManifest.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2022 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. - --> - -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="co.nstant.in.cbor" > - - <uses-sdk android:minSdkVersion="30" /> - <application /> - <instrumentation - android:name="androidx.test.runner.AndroidJUnitRunner" - android:targetPackage="co.nstant.in.cbor" > - </instrumentation> -</manifest> diff --git a/AndroidTest.xml b/AndroidTest.xml deleted file mode 100644 index 824c8b3..0000000 --- a/AndroidTest.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2022 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 cbor-java tests"> - <option name="config-descriptor:metadata" key="mainline-param" value="com.google.android.adservices.apex" /> - <option name="test-suite-tag" value="mts" /> - - <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller"> - <option name="cleanup-apks" value="true"/> - <option name="test-file-name" value="CborJavaTestCases.apk"/> - </target_preparer> - - <test class="com.android.tradefed.testtype.AndroidJUnitTest"> - <option name="package" value="co.nstant.in.cbor"/> - </test> -</configuration> @@ -1,17 +1,3 @@ -Copyright 2013-2021 Constantin Rack - -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. --------------------------------------------------------------------------------- Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ diff --git a/TEST_MAPPING b/TEST_MAPPING deleted file mode 100644 index 943da69..0000000 --- a/TEST_MAPPING +++ /dev/null @@ -1,8 +0,0 @@ -{ - "mainline-presubmit": [ - { - "name": "CborJavaTestCases[com.google.android.adservices.apex]" - } - ] -} - |