diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-21 16:58:58 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-21 16:58:58 +0000 |
commit | d0ce0e78739eaa088c6b1716ff8ecb81fb83f8b4 (patch) | |
tree | 48269b553015dd591fe5f742a7f5e3f66131d418 | |
parent | 69ed0e13ca854f8d478b707b3053e7638dedc379 (diff) | |
parent | e25f9c0726366f8bfa4a0dd71a8bc508ab415e46 (diff) | |
download | lzma-d0ce0e78739eaa088c6b1716ff8ecb81fb83f8b4.tar.gz |
Snap for 7570015 from e25f9c0726366f8bfa4a0dd71a8bc508ab415e46 to mainline-sdkext-releaseandroid-mainline-12.0.0_r81android-mainline-12.0.0_r37android-mainline-12.0.0_r17android-mainline-12.0.0_r109aml_sdk_311710000android12-mainline-sdkext-release
Change-Id: Icf8b101e9b3176869c6efd67f503e96b18c62b8e
-rw-r--r-- | Android.bp | 16 | ||||
-rw-r--r-- | C/Android.bp | 14 | ||||
-rw-r--r-- | METADATA | 3 |
3 files changed, 31 insertions, 2 deletions
@@ -1,3 +1,19 @@ +package { + default_applicable_licenses: ["external_lzma_license"], +} + +// Added automatically by a large-scale-change +license { + name: "external_lzma_license", + visibility: [":__subpackages__"], + license_kinds: [ + "legacy_unencumbered", + ], + license_text: [ + "NOTICE", + ], +} + subdirs = [ "C", ] diff --git a/C/Android.bp b/C/Android.bp index 16f72b7..e3f796c 100644 --- a/C/Android.bp +++ b/C/Android.bp @@ -1,10 +1,19 @@ // Copyright 2015 The Android Open Source Project +package { + // A large-scale-change added 'default_applicable_licenses' to import + // the below license kinds from "external_lzma_license": + // legacy_unencumbered + default_applicable_licenses: ["external_lzma_license"], +} + cc_library { name: "liblzma", host_supported: true, vendor_available: true, + product_available: true, recovery_available: true, + vendor_ramdisk_available: true, native_bridge_supported: true, vndk: { enabled: true, @@ -85,7 +94,8 @@ cc_library { apex_available: [ "//apex_available:platform", - "com.android.art.debug", // from libartbase - "com.android.art.release", + "com.android.art", // from libartbase + "com.android.art.debug", ], + min_sdk_version: "apex_inherit", } diff --git a/METADATA b/METADATA new file mode 100644 index 0000000..313792c --- /dev/null +++ b/METADATA @@ -0,0 +1,3 @@ +third_party { + license_type: UNENCUMBERED +} |