From 297612b7c27caae30f61fc6c194da8148c94b7fb Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Thu, 23 Apr 2020 16:32:33 -0700 Subject: Add license type: Apache2 is a NOTICE license Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Exempt-From-Owner-Approval: janitorial work Change-Id: I1c51ab903ef673b3bcfc2d1f4b0d6afab3e57661 --- METADATA | 1 + 1 file changed, 1 insertion(+) diff --git a/METADATA b/METADATA index 0e79ebf..bf13086 100644 --- a/METADATA +++ b/METADATA @@ -11,6 +11,7 @@ third_party { value: "https://github.com/google/caliper/archive/73efbe138dafba57d6a890257961ba83f41b89f2.zip" } version: "73efbe138dafba57d6a890257961ba83f41b89f2" + license_type: NOTICE last_upgrade_date { year: 2015 month: 11 -- cgit v1.2.3 From f0a3eafc7ecccfa7adbb08dcf455545ace087a43 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 25 Jun 2020 23:17:29 -0700 Subject: Use jsr330 instead of dagger2-inject Use external/jsr330 instead of the local dagger2-inject prebuilts. Bug: 158870037 Test: m checkbuild Change-Id: I3ab3ac5af6039c0d8a68c5a893ca902ca7d7e5ff --- Android.bp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Android.bp b/Android.bp index d15b6f3..c703270 100644 --- a/Android.bp +++ b/Android.bp @@ -25,8 +25,8 @@ java_library_host { "apache-commons-math", "caliper-prebuilts", "dagger2", - "dagger2-inject", "guava", + "jsr330", ], // Use Dagger2 annotation processor -- cgit v1.2.3 From 21eae118bc65a40ff0eada8922bce9943c80334b Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Thu, 21 Jan 2021 11:19:05 -0800 Subject: Fix license_type. Contains GPL See: http://go/android-license-checking-v2-lsc Test: m all Bug: 151953481 Bug: 151177513 Bug: 67772237 Change-Id: Ie8271bf516a398548df55d70f258b257dd3ea878 --- METADATA | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/METADATA b/METADATA index bf13086..4c46726 100644 --- a/METADATA +++ b/METADATA @@ -11,7 +11,8 @@ third_party { value: "https://github.com/google/caliper/archive/73efbe138dafba57d6a890257961ba83f41b89f2.zip" } version: "73efbe138dafba57d6a890257961ba83f41b89f2" - license_type: NOTICE + # would be NOTICE save for lib/*.jar.txt + license_type: RESTRICTED last_upgrade_date { year: 2015 month: 11 -- cgit v1.2.3 From e2309a4fbb5ac0febbd006f1c46445fc758faf7f Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Fri, 12 Feb 2021 20:14:05 -0800 Subject: [LSC] Add LOCAL_LICENSE_KINDS to external/caliper Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-CDDL SPDX-license-identifier-CDDL-1.0 SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I6fa5e781c1bbf9c1f65687e2ecc2af9081dd5746 --- Android.bp | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/Android.bp b/Android.bp index c703270..e0ee8da 100644 --- a/Android.bp +++ b/Android.bp @@ -15,6 +15,46 @@ // build caliper host jar // ============================================================ +package { + default_applicable_licenses: ["external_caliper_license"], +} + +// Added automatically by a large-scale-change that took the approach of +// 'apply every license found to every target'. While this makes sure we respect +// every license restriction, it may not be entirely correct. +// +// e.g. GPL in an MIT project might only apply to the contrib/ directory. +// +// Please consider splitting the single license below into multiple licenses, +// taking care not to lose any license_kind information, and overriding the +// default license using the 'licenses: [...]' property on targets as needed. +// +// For unused files, consider creating a 'fileGroup' with "//visibility:private" +// to attach the license to, and including a comment whether the files may be +// used in the current project. +// +// large-scale-change included anything that looked like it might be a license +// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc. +// +// Please consider removing redundant or irrelevant files from 'license_text:'. +// See: http://go/android-license-faq +license { + name: "external_caliper_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "SPDX-license-identifier-CDDL", + "SPDX-license-identifier-CDDL-1.0", + "SPDX-license-identifier-GPL", + "SPDX-license-identifier-GPL-2.0", + "SPDX-license-identifier-LGPL", + ], + license_text: [ + "COPYING", + "NOTICE", + ], +} + java_library_host { name: "caliper", -- cgit v1.2.3 From c584a577cda484e022a6b01e04e90161697f2236 Mon Sep 17 00:00:00 2001 From: Julien Desprez Date: Wed, 24 Feb 2021 17:03:17 +0000 Subject: Mark caliper-tests as not unit tests They currently require some external jar which doesn't seem to be passed as data from the target. Change-Id: Iad340242cf3e6c90e6f02c685b9a685f3ab20e32 Test: presubmit Bug: 180736967 --- Android.bp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Android.bp b/Android.bp index e0ee8da..6d4619b 100644 --- a/Android.bp +++ b/Android.bp @@ -113,6 +113,11 @@ java_test_host { "junit", "mockito", ], + // Avoid the tests running as unit tests. They have some jar requirement that doesn't currently + // quite work in CI. + test_options: { + unit_test: false, + }, // Use Dagger2 annotation processor plugins: ["dagger2-compiler"], -- cgit v1.2.3