diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-15 01:35:13 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-15 01:35:13 +0000 |
commit | b6221f04c84ca97aa59707ada7f96a46d66dd63b (patch) | |
tree | 5b6f5a3ebc94e897e7135e28a01bf37befedcecc | |
parent | 9b3c02f8d1cf0e0fde6faaaf63bb0179af383100 (diff) | |
parent | 8471e1f2585823f903b82780762e9fa89f9badac (diff) | |
download | smali-b6221f04c84ca97aa59707ada7f96a46d66dd63b.tar.gz |
Snap for 7550844 from 8471e1f2585823f903b82780762e9fa89f9badac to mainline-os-statsd-releaseandroid-mainline-12.0.0_r84android-mainline-12.0.0_r58android12-mainline-statsd-release
Change-Id: I2ecd97a565906124d0c9af9f384cba0319824c07
-rw-r--r-- | Android.bp | 30 | ||||
-rw-r--r-- | METADATA | 3 | ||||
-rw-r--r-- | baksmali/Android.bp | 9 | ||||
-rw-r--r-- | deodexerant/Android.bp | 9 | ||||
-rw-r--r-- | dexlib2/Android.bp | 12 | ||||
-rw-r--r-- | smali/Android.bp | 9 | ||||
-rw-r--r-- | util/Android.bp | 9 |
7 files changed, 80 insertions, 1 deletions
@@ -12,6 +12,36 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + default_applicable_licenses: ["external_smali_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_smali_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "SPDX-license-identifier-BSD", + ], + license_text: [ + "NOTICE", + ], +} + filegroup { name: "smali_script", srcs: ["scripts/smali"], diff --git a/METADATA b/METADATA new file mode 100644 index 00000000..d97975ca --- /dev/null +++ b/METADATA @@ -0,0 +1,3 @@ +third_party { + license_type: NOTICE +} diff --git a/baksmali/Android.bp b/baksmali/Android.bp index 7f95539d..6d6d4f45 100644 --- a/baksmali/Android.bp +++ b/baksmali/Android.bp @@ -13,6 +13,15 @@ // limitations under the License. //create a new baksmali.properties file using the correct version +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_smali_license" + // to get the below license kinds: + // SPDX-license-identifier-BSD + default_applicable_licenses: ["external_smali_license"], +} + genrule { name: "baksmali_version", srcs: [":smali_build.gradle"], diff --git a/deodexerant/Android.bp b/deodexerant/Android.bp index 48d6fe29..a1cd1b47 100644 --- a/deodexerant/Android.bp +++ b/deodexerant/Android.bp @@ -27,6 +27,15 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_smali_license" + // to get the below license kinds: + // SPDX-license-identifier-BSD + default_applicable_licenses: ["external_smali_license"], +} + cc_binary { name: "deodexerant", diff --git a/dexlib2/Android.bp b/dexlib2/Android.bp index 4132d45c..e8eb04d5 100644 --- a/dexlib2/Android.bp +++ b/dexlib2/Android.bp @@ -15,6 +15,16 @@ // build dexlib2 jar // ============================================================ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_smali_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + // SPDX-license-identifier-BSD + default_applicable_licenses: ["external_smali_license"], +} + java_library_host { name: "dexlib2", @@ -64,4 +74,4 @@ java_library_host { "jcommander", "jsr305", ], -}
\ No newline at end of file +} diff --git a/smali/Android.bp b/smali/Android.bp index 4bbfa1b5..43cfea17 100644 --- a/smali/Android.bp +++ b/smali/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_smali_license" + // to get the below license kinds: + // SPDX-license-identifier-BSD + default_applicable_licenses: ["external_smali_license"], +} + genrule { name: "smali_version", srcs: [":smali_build.gradle"], diff --git a/util/Android.bp b/util/Android.bp index 55f89eb9..69678158 100644 --- a/util/Android.bp +++ b/util/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_smali_license" + // to get the below license kinds: + // SPDX-license-identifier-BSD + default_applicable_licenses: ["external_smali_license"], +} + java_library_host { name: "smali-util", srcs: ["src/main/java/**/*.java"], |