aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2021-02-17 17:22:23 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-17 17:22:23 +0000
commitc52e3ef5b428edbd4d4b2d51f67e673fe04ce09e (patch)
treee75c0d4423dd8df0066eea12d9f110efbd7e1261
parent0e59cb2be05e40d14b59dc706f4b412715fdc92a (diff)
parent0383485f6887204bebf59770542cf23837cd9e2c (diff)
downloadzxing-android12-qpr3-s6-release.tar.gz
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/zxing" am: b30bd7f943 am: 03c373271a am: 0383485f68android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1
Original change: https://android-review.googlesource.com/c/platform/external/zxing/+/1588581 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5be3540555fec6b9ed11975dec0398d86068edb7
-rw-r--r--core/Android.bp17
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,