diff options
author | Bob Badour <bbadour@google.com> | 2021-02-17 18:11:24 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-17 18:11:24 +0000 |
commit | f2e6319100af9efd7498160d1f1d992a36add5f8 (patch) | |
tree | e75c0d4423dd8df0066eea12d9f110efbd7e1261 | |
parent | 0e59cb2be05e40d14b59dc706f4b412715fdc92a (diff) | |
parent | c52e3ef5b428edbd4d4b2d51f67e673fe04ce09e (diff) | |
download | zxing-f2e6319100af9efd7498160d1f1d992a36add5f8.tar.gz |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/zxing" am: b30bd7f943 am: 03c373271a am: 0383485f68 am: c52e3ef5b4android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-release
Original change: https://android-review.googlesource.com/c/platform/external/zxing/+/1588581
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iacd2f6a00a3f2a8940213e0952bab6946ae721e7
-rw-r--r-- | core/Android.bp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/core/Android.bp b/core/Android.bp index ab09c6d72..252cbb292 100644 --- a/core/Android.bp +++ b/core/Android.bp @@ -1,3 +1,20 @@ +package { + default_applicable_licenses: ["external_zxing_core_license"], +} + +// Added automatically by a large-scale-change +// See: http://go/android-license-faq +license { + name: "external_zxing_core_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "NOTICE", + ], +} + java_import { name: "zxing-core-1.7", host_supported: true, |