diff options
-rw-r--r-- | Android.bp | 45 | ||||
-rw-r--r-- | METADATA | 3 | ||||
-rw-r--r-- | squashfs-tools/Android.bp | 11 | ||||
-rw-r--r-- | squashfs-tools/android.c | 1 | ||||
-rw-r--r-- | squashfs-tools/mksquashfs.c | 1 |
5 files changed, 61 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..7ff2214 --- /dev/null +++ b/Android.bp @@ -0,0 +1,45 @@ +// +// Copyright (C) 2021 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. + +package { + default_applicable_licenses: ["external_squashfs-tools_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. +// See: http://go/android-license-faq +license { + name: "external_squashfs-tools_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "SPDX-license-identifier-GPL", + "SPDX-license-identifier-GPL-2.0", + ], + license_text: [ + "COPYING", + ], +} diff --git a/METADATA b/METADATA new file mode 100644 index 0000000..6d8601b --- /dev/null +++ b/METADATA @@ -0,0 +1,3 @@ +third_party { + license_type: RESTRICTED +} diff --git a/squashfs-tools/Android.bp b/squashfs-tools/Android.bp index 96a94dc..7619367 100644 --- a/squashfs-tools/Android.bp +++ b/squashfs-tools/Android.bp @@ -12,6 +12,17 @@ // 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_squashfs-tools_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + // SPDX-license-identifier-GPL + // SPDX-license-identifier-GPL-2.0 + default_applicable_licenses: ["external_squashfs-tools_license"], +} + cc_defaults { name: "squashfs-tools_defaults", diff --git a/squashfs-tools/android.c b/squashfs-tools/android.c index a383d2b..0bbaa7a 100644 --- a/squashfs-tools/android.c +++ b/squashfs-tools/android.c @@ -30,6 +30,7 @@ #include "android.h" #include "private/android_filesystem_config.h" #include "private/canned_fs_config.h" +#include "private/fs_config.h" #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c index 6fe9555..dd75aaa 100644 --- a/squashfs-tools/mksquashfs.c +++ b/squashfs-tools/mksquashfs.c @@ -86,6 +86,7 @@ #include "android.h" #include "private/android_filesystem_config.h" #include "private/canned_fs_config.h" +#include "private/fs_config.h" int android_config = FALSE; char *context_file = NULL; char *mount_point = NULL; |