diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-08-08 17:23:42 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-08-08 17:23:42 +0000 |
commit | 4984b66c4148da9c24c99e6210faebcecaba8003 (patch) | |
tree | f3ce0cb8e0d38184256ed4fa99485733dd4407c9 | |
parent | 8fcc5ee074717c3383d4a8ad9b5cfc1a10b2e809 (diff) | |
parent | 901a33cc76d1e8947bd714b6be6beb213a7083de (diff) | |
download | eigen-android-14.0.0_r23.tar.gz |
Merge "Update Eigen metadata." am: 70bf30e28d am: 96900fb9a6 am: b9c41e0824 am: b49bddfd5c am: 901a33cc76android-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-u-qpr1-beta-2.2-gplandroid-u-qpr1-beta-1-gplandroid-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-tests-releaseandroid14-tests-devandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-release
Original change: https://android-review.googlesource.com/c/platform/external/eigen/+/2176530
Change-Id: I38935cabf42842ba225fa463c7aaeaad6bd736c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 82 | ||||
-rw-r--r-- | METADATA | 16 | ||||
-rw-r--r-- | blas/Android.bp | 2 |
3 files changed, 64 insertions, 36 deletions
diff --git a/Android.bp b/Android.bp index 6e2bc6a80..9433a497b 100644 --- a/Android.bp +++ b/Android.bp @@ -13,57 +13,70 @@ // limitations under the License. package { - default_applicable_licenses: ["external_eigen_license"], + default_applicable_licenses: ["eigen_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_eigen_license", + name: "eigen_license", visibility: [":__subpackages__"], license_kinds: [ + // Apache 2.0 is only used in Eigen/src/Core/arch/Default/BFloat16.h, + // which was copied from TensorFlow. "SPDX-license-identifier-Apache-2.0", + // BSD is used in CMake build scripts, which are not used in Android, + // and for code derived from the MINPACK library. "SPDX-license-identifier-BSD", - "SPDX-license-identifier-BSL-1.0", - "SPDX-license-identifier-GPL", - "SPDX-license-identifier-GPL-2.0", - "SPDX-license-identifier-GPL-3.0", - "SPDX-license-identifier-LGPL", - "SPDX-license-identifier-LGPL-2.1", - "SPDX-license-identifier-LGPL-3.0", - "SPDX-license-identifier-MIT", - "SPDX-license-identifier-MPL", + // Almost all of the actual Eigen code is licensed under MPL 2.0. "SPDX-license-identifier-MPL-2.0", - "legacy_unencumbered", ], license_text: [ + "COPYING.APACHE", "COPYING.BSD", - "COPYING.GPL", - "COPYING.LGPL", "COPYING.MINPACK", "COPYING.MPL2", - "COPYING.README", "NOTICE", ], } +license { + name: "eigen_bench_license", + visibility: ["//visibility:private"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "SPDX-license-identifier-GPL-2.0+", + ], + license_text: [ + "COPYING.APACHE", + "COPYING.GPL", + ], +} + +license { + name: "eigen_restricted_code_license", + visibility: ["//visibility:private"], + license_kinds: [ + "SPDX-license-identifier-LGPL-2.1", + ], + license_text: ["COPYING.LGPL"], +} + +filegroup { + name: "eigen_bench", + srcs: ["bench/**/*"], + licenses: ["eigen_bench_license"], + visibility: ["//visibility:private"], +} + +filegroup { + name: "eigen_restricted_code", + srcs: [ + "unsupported/Eigen/src/IterativeSolvers/ConstrainedConjGrad.h", + "unsupported/Eigen/src/IterativeSolvers/IterationController.h", + ], + licenses: ["eigen_restricted_code_license"], + visibility: ["//visibility:private"], +} + cc_library_headers { name: "libeigen", @@ -71,6 +84,7 @@ cc_library_headers { // contain actual exported headers. When capturing header files for // snapshot, only these two directories will be globbed. export_include_dirs: ["."], + cflags: ["-DEIGEN_MPL2_ONLY"], vendor_available: true, host_supported: true, @@ -1,3 +1,17 @@ +name: "eigen" +description: + "C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms." + third_party { - license_type: RESTRICTED + url { + type: HOMEPAGE + value: "https://eigen.tuxfamily.org/" + } + url { + type: GIT + value: "https://gitlab.com/libeigen/eigen.git" + } + version: "3.4.0" + last_upgrade_date { year: 2022 month: 2 day: 25 } + license_type: RECIPROCAL } diff --git a/blas/Android.bp b/blas/Android.bp index b8a3bf47f..00e7bdb46 100644 --- a/blas/Android.bp +++ b/blas/Android.bp @@ -18,7 +18,7 @@ package { // all of the 'license_kinds' from "external_eigen_license" // to get the below license kinds: // SPDX-license-identifier-MPL-2.0 - default_applicable_licenses: ["external_eigen_license"], + default_applicable_licenses: ["eigen_license"], } cc_defaults { |