From d58084b674464d8e5095b3f62edcb11115abfe3b Mon Sep 17 00:00:00 2001 From: Jorge Saldivar Date: Fri, 17 Jun 2022 19:45:14 +0000 Subject: Add owners to external/cbor-java Bug: 236166868 Test: N/A Change-Id: I63af10487e7f666636492f786438237a6d4066f3 Merged-In: I22374475b0995e8aee472f94d151a152214da635 --- OWNERS | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 OWNERS diff --git a/OWNERS b/OWNERS new file mode 100644 index 0000000..5193b1c --- /dev/null +++ b/OWNERS @@ -0,0 +1,4 @@ +# Default code reviewers picked from top 3 or more developers. +# Please update this list if you find better candidates. +zeuthen@google.com +jorgesaldivar@google.com -- cgit v1.2.3 From 6f2f97de1e7018520868ce652f313f318960700d Mon Sep 17 00:00:00 2001 From: Jorge Saldivar Date: Tue, 21 Jun 2022 23:06:06 +0000 Subject: Added MTS tests to external/cbor-java Test: atest CborJavaTestCases Change-Id: I1c422b8c14ab635834f78bf3cf7258d8cc24d1b7 --- Android.bp | 21 +++++++++++++++++++++ AndroidManifest.xml | 27 +++++++++++++++++++++++++++ AndroidTest.xml | 28 ++++++++++++++++++++++++++++ TEST_MAPPING | 8 ++++++++ 4 files changed, 84 insertions(+) create mode 100644 AndroidManifest.xml create mode 100644 AndroidTest.xml create mode 100644 TEST_MAPPING diff --git a/Android.bp b/Android.bp index 0cc7110..d168775 100644 --- a/Android.bp +++ b/Android.bp @@ -40,3 +40,24 @@ java_library { sdk_version: "core_current", } + +android_test { + name: "CborJavaTestCases", + srcs: [ + "src/test/**/*.java", + ], + static_libs: [ + "androidx.test.rules", + "cbor-java", + ], + libs: [ + "android.test.base", + ], + min_sdk_version: "33", + sdk_version: "test_current", + test_suites: [ + "general-tests", + "mts-adservices", + ], + visibility: ["//visibility:private"], +} diff --git a/AndroidManifest.xml b/AndroidManifest.xml new file mode 100644 index 0000000..a0c1c65 --- /dev/null +++ b/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + + + + diff --git a/AndroidTest.xml b/AndroidTest.xml new file mode 100644 index 0000000..0f077ff --- /dev/null +++ b/AndroidTest.xml @@ -0,0 +1,28 @@ + + + + \ No newline at end of file diff --git a/TEST_MAPPING b/TEST_MAPPING new file mode 100644 index 0000000..8208df6 --- /dev/null +++ b/TEST_MAPPING @@ -0,0 +1,8 @@ +{ + "mainline-presubmit": [ + { + "name": "CborJavaTestCases" + } + ] +} + -- cgit v1.2.3 From 43eaf9e04d0bb0f55644a8ce90de48ab2644d7b1 Mon Sep 17 00:00:00 2001 From: Jorge Saldivar Date: Mon, 13 Jun 2022 19:48:24 +0000 Subject: Expose to AdServices within platform As part of attribution reporting (https://developer.android.com/design-for-safety/privacy-sandbox/attribution), payloads will be CBOR encoded in Android, same as Chromium payloads https://github.com/WICG/attribution-reporting-api/blob/3d0a541c708391d73905afafa155d6753c8565af/AGGREGATE.md#encrypted-payload Test: mma Change-Id: I2b419ce76bcbe0d552ca60dacc0330d655dc755b --- Android.bp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Android.bp b/Android.bp index 0cc7110..29b79d4 100644 --- a/Android.bp +++ b/Android.bp @@ -39,4 +39,8 @@ java_library { ], sdk_version: "core_current", + apex_available: [ + "//apex_available:platform", + "com.android.adservices", + ], } -- cgit v1.2.3 From 49c1be88f8718c4239485fa51d247016f7ed0eb9 Mon Sep 17 00:00:00 2001 From: Jorge Saldivar Date: Wed, 29 Jun 2022 18:58:00 +0000 Subject: Updates LICENSE information to external/cbor-java Test: N/A Change-Id: Ib5608596412d0cb11086303c7e6ca2b3b2b76f0b --- LICENSE | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/LICENSE b/LICENSE index e06d208..8ed89ab 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,17 @@ +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/ -- cgit v1.2.3 From d263240e9b9ef3e4b4c5f3dd93c5892ef3937866 Mon Sep 17 00:00:00 2001 From: Jorge Saldivar Date: Fri, 1 Jul 2022 16:32:54 +0000 Subject: Added min_sdk_version 30 to cbor-java Test: mma Change-Id: Ic3a7605006d598af833f47470333a765a5b55994 --- Android.bp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Android.bp b/Android.bp index 922310c..3ffcb38 100644 --- a/Android.bp +++ b/Android.bp @@ -37,7 +37,7 @@ java_library { srcs: [ "src/main/**/*.java", ], - + min_sdk_version: "30", sdk_version: "core_current", apex_available: [ "//apex_available:platform", @@ -57,7 +57,7 @@ android_test { libs: [ "android.test.base", ], - min_sdk_version: "33", + min_sdk_version: "30", sdk_version: "test_current", test_suites: [ "general-tests", -- cgit v1.2.3 From c2737262813cd118b2c93d0fe7ae6babfb89dccc Mon Sep 17 00:00:00 2001 From: Jorge Saldivar Date: Wed, 20 Jul 2022 22:14:27 +0000 Subject: Updated minVersion to 30 Min version was updated to 30, but this file was missed on ag/19141375 Test: mma Change-Id: I52e7046d6dad5edded593c963d7913fa4848a81f --- AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a0c1c65..5009bad 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -18,7 +18,7 @@ - + Date: Wed, 20 Jul 2022 20:07:50 +0000 Subject: Fixes mainline-presubmit for cbor-java Bug: 239268572 Test: mma Change-Id: I0f6874e1195b3a74baa5db2c22c830f9b6b7bc95 --- Android.bp | 3 +++ AndroidTest.xml | 3 ++- TEST_MAPPING | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Android.bp b/Android.bp index 3ffcb38..3386f9d 100644 --- a/Android.bp +++ b/Android.bp @@ -57,6 +57,9 @@ android_test { libs: [ "android.test.base", ], + test_mainline_modules: [ + "com.google.android.adservices.apex" + ], min_sdk_version: "30", sdk_version: "test_current", test_suites: [ diff --git a/AndroidTest.xml b/AndroidTest.xml index 0f077ff..824c8b3 100644 --- a/AndroidTest.xml +++ b/AndroidTest.xml @@ -15,6 +15,7 @@ ~ limitations under the License. --> + \ No newline at end of file + diff --git a/TEST_MAPPING b/TEST_MAPPING index 8208df6..943da69 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,7 +1,7 @@ { "mainline-presubmit": [ { - "name": "CborJavaTestCases" + "name": "CborJavaTestCases[com.google.android.adservices.apex]" } ] } -- cgit v1.2.3 From 1edfc7e5d691ee7d8e7849cfe840121fb1a2d977 Mon Sep 17 00:00:00 2001 From: Jorge Saldivar Date: Fri, 22 Jul 2022 14:06:52 +0000 Subject: Fixes build issues Bug: 239863396 Test: mma Change-Id: I2bd0acdd4c787befd33ea216c6993f1525a54bc2 --- Android.bp | 4 ++++ AndroidManifest.xml | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Android.bp b/Android.bp index 3386f9d..3b27e4d 100644 --- a/Android.bp +++ b/Android.bp @@ -38,6 +38,8 @@ java_library { "src/main/**/*.java", ], min_sdk_version: "30", + // Setting target sdk to 10000 to prevent issues such as b/220675744 + target_sdk_version: "10000", sdk_version: "core_current", apex_available: [ "//apex_available:platform", @@ -61,6 +63,8 @@ android_test { "com.google.android.adservices.apex" ], min_sdk_version: "30", + // Setting target sdk to 10000 to prevent issues such as b/220675744 + target_sdk_version: "10000", sdk_version: "test_current", test_suites: [ "general-tests", diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5009bad..f5e6a1a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -18,7 +18,6 @@ - Date: Fri, 5 Aug 2022 22:38:28 +0000 Subject: Unpin FutureApiLevel target_sdk_version With aosp/2164782 in tm-mainline-prod, this will be done automatically by the build system for MTS tests Bug: 227473065 Test: m CborJavaTestCases Test: aapt2 dump badging out/soong/.intermediates/external/cbor-java/CborJavaTestCases/android_common/CborJavaTestCases.apk | grep targetSdkVersion #targetSdkVersion:'10000' Change-Id: I9c1c02164adffeacf42e69664d2d0ccdc0f2ffb2 --- Android.bp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Android.bp b/Android.bp index 3b27e4d..3386f9d 100644 --- a/Android.bp +++ b/Android.bp @@ -38,8 +38,6 @@ java_library { "src/main/**/*.java", ], min_sdk_version: "30", - // Setting target sdk to 10000 to prevent issues such as b/220675744 - target_sdk_version: "10000", sdk_version: "core_current", apex_available: [ "//apex_available:platform", @@ -63,8 +61,6 @@ android_test { "com.google.android.adservices.apex" ], min_sdk_version: "30", - // Setting target sdk to 10000 to prevent issues such as b/220675744 - target_sdk_version: "10000", sdk_version: "test_current", test_suites: [ "general-tests", -- cgit v1.2.3 From a3d21b2d84162c058831ae2f1b769c8549e8265c Mon Sep 17 00:00:00 2001 From: Seth Moore Date: Fri, 28 Oct 2022 13:55:15 -0700 Subject: Allow any apex to link cbor-java Test: build Change-Id: I48e7fb5e9f298099b76ce0489fc424349a13de15 Merged-In: I48e7fb5e9f298099b76ce0489fc424349a13de15 --- Android.bp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Android.bp b/Android.bp index 3386f9d..06a5d24 100644 --- a/Android.bp +++ b/Android.bp @@ -40,8 +40,8 @@ java_library { min_sdk_version: "30", sdk_version: "core_current", apex_available: [ + "//apex_available:anyapex", "//apex_available:platform", - "com.android.adservices", ], } -- cgit v1.2.3 From ba063191e3473e773229ae1ec5edeaf6b91762d5 Mon Sep 17 00:00:00 2001 From: Jorge Saldivar Date: Wed, 21 Dec 2022 16:28:11 +0000 Subject: Remove test_mainline_module on CborJavaTestCases Bug: 263308389 Cbor tests don't need a mainline module to verify the test outcome. The library is a stand alone library which doesn't require installing a mainline module. Test: atest CborJavaTestCases Change-Id: Ie24988f2c223789e52423ea0d5b5b9c75864f65d --- Android.bp | 3 --- 1 file changed, 3 deletions(-) diff --git a/Android.bp b/Android.bp index 06a5d24..bf8032e 100644 --- a/Android.bp +++ b/Android.bp @@ -57,9 +57,6 @@ android_test { libs: [ "android.test.base", ], - test_mainline_modules: [ - "com.google.android.adservices.apex" - ], min_sdk_version: "30", sdk_version: "test_current", test_suites: [ -- cgit v1.2.3