diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-15 02:00:35 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-15 02:00:35 +0000 |
commit | 7bfed38ba3b9a993134ba91f83eb113037df02a3 (patch) | |
tree | b759c77cbd80c075943070072ecca105696b2a18 | |
parent | ba5c0d4613523dd719ffc4b127da9207071bfcd0 (diff) | |
parent | 80db734614f4593cd5cada5158c31cad5cfb5c43 (diff) | |
download | eigen-android12-mainline-captiveportallogin-release.tar.gz |
Snap for 7550930 from 80db734614f4593cd5cada5158c31cad5cfb5c43 to mainline-captiveportallogin-releaseandroid-mainline-12.0.0_r6android-mainline-12.0.0_r23android12-mainline-captiveportallogin-release
Change-Id: I48327797f6224e0a5ab06b238b6ffbfda35dfcda
-rw-r--r-- | Android.bp | 52 | ||||
-rw-r--r-- | Eigen/Core | 1 | ||||
-rw-r--r-- | Eigen/src/Core/arch/CUDA/Half.h | 1 | ||||
-rw-r--r-- | METADATA | 3 | ||||
-rw-r--r-- | blas/Android.bp | 9 |
5 files changed, 66 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp index d7717e412..23c3280d0 100644 --- a/Android.bp +++ b/Android.bp @@ -12,6 +12,58 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + default_applicable_licenses: ["external_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", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "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", + "SPDX-license-identifier-MPL-2.0", + "legacy_unencumbered", + ], + license_text: [ + "COPYING.BSD", + "COPYING.GPL", + "COPYING.LGPL", + "COPYING.MINPACK", + "COPYING.MPL2", + "COPYING.README", + "NOTICE", + ], +} + cc_library_headers { name: "libeigen", diff --git a/Eigen/Core b/Eigen/Core index 0f7fa630d..ac7e39418 100644 --- a/Eigen/Core +++ b/Eigen/Core @@ -260,6 +260,7 @@ #include <cmath> #include <cassert> #include <functional> +#include <sstream> #include <iosfwd> #include <cstring> #include <string> diff --git a/Eigen/src/Core/arch/CUDA/Half.h b/Eigen/src/Core/arch/CUDA/Half.h index 294c517ea..88dd385a5 100644 --- a/Eigen/src/Core/arch/CUDA/Half.h +++ b/Eigen/src/Core/arch/CUDA/Half.h @@ -42,6 +42,7 @@ #define EIGEN_EXPLICIT_CAST(tgt_type) operator tgt_type() #endif +#include <sstream> namespace Eigen { diff --git a/METADATA b/METADATA new file mode 100644 index 000000000..6d8601bb6 --- /dev/null +++ b/METADATA @@ -0,0 +1,3 @@ +third_party { + license_type: RESTRICTED +} diff --git a/blas/Android.bp b/blas/Android.bp index 4d72be212..b8a3bf47f 100644 --- a/blas/Android.bp +++ b/blas/Android.bp @@ -12,6 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // 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"], +} + cc_defaults { name: "eigen-defaults", srcs: [ |