From 153d61e685d083f35d2aff53cb03ed12aa977ac4 Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Thu, 16 Apr 2020 18:48:30 +0900 Subject: Set min_sdk_version to be part of mainline modules Modules contributing mainline modules (APK/APEX) should set min_sdk_version as well as apex_available. For now setting min_sdk_version doesn't change build outputs. But build-time checks will be added soon. Bug: 152655956 Test: m Change-Id: Ieda1b7f0de1c4a5ce4137a0b17731cf619826f9e --- files/Android.bp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/files/Android.bp b/files/Android.bp index 5d7cbb6a..6939a1c1 100644 --- a/files/Android.bp +++ b/files/Android.bp @@ -63,6 +63,12 @@ cc_library { shared_libs: ["libjpeg"], export_include_dirs: ["include"], + + apex_available: [ + "//apex_available:platform", + "com.android.media.swcodec", + ], + min_sdk_version: "29", } // compatibilty static library until all uses of libyuv_static are replaced @@ -71,6 +77,11 @@ cc_library_static { name: "libyuv_static", vendor_available: true, whole_static_libs: ["libyuv"], + apex_available: [ + "//apex_available:platform", + "com.android.media.swcodec", + ], + min_sdk_version: "29", } cc_test { -- cgit v1.2.3 From 557b77ac1fda803fc5469df88271ed8a172c8e97 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Wed, 29 Apr 2020 12:20:05 -0700 Subject: Add METADATA to libyuv: BSD=NOTICE Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I192eecfcec9032209db0c2dd89d91edb6197e6e7 --- METADATA | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 METADATA 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 +} -- cgit v1.2.3 From 8ebc89e5736b8468b511b1495e412930c9b911d2 Mon Sep 17 00:00:00 2001 From: Justin Yun Date: Wed, 11 Nov 2020 18:15:59 +0900 Subject: Add product_available to product available modules vendor_available modules were available to product modules. However, not all vendor_available modules are required to be available to product modules. Some modules want to be available only to product modules but not vendor modules. To cover the requirement, we separate product_available from vendor_available. vendor_available will not provide product available module. Bug: 150902910 Test: build Change-Id: Ic368d353043c01b192bb167168ef5c64edfb9a90 --- files/Android.bp | 1 + 1 file changed, 1 insertion(+) diff --git a/files/Android.bp b/files/Android.bp index 6ef6e8d3..9dd6163d 100644 --- a/files/Android.bp +++ b/files/Android.bp @@ -1,6 +1,7 @@ cc_library { name: "libyuv", vendor_available: true, + product_available: true, host_supported: true, vndk: { enabled: true, -- cgit v1.2.3 From 5b23e3abe9f1de45bf39cdaa39a7dc4daf57ad6d Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Fri, 12 Feb 2021 18:24:37 -0800 Subject: [LSC] Add LOCAL_LICENSE_KINDS to external/libyuv Added SPDX-license-identifier-BSD to: Android.bp files/Android.bp files/fuzz/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ifb0f6e22e614dd39cb28f3d7a01af7a1e46f0a54 --- Android.bp | 17 +++++++++++++++++ files/Android.bp | 24 ++++++++++++++++++++++++ files/fuzz/Android.bp | 9 +++++++++ 3 files changed, 50 insertions(+) diff --git a/Android.bp b/Android.bp index 515d5626..e4ed511c 100644 --- a/Android.bp +++ b/Android.bp @@ -1 +1,18 @@ +package { + default_applicable_licenses: ["external_libyuv_license"], +} + +// Added automatically by a large-scale-change +// See: http://go/android-license-faq +license { + name: "external_libyuv_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-BSD", + ], + license_text: [ + "LICENSE", + ], +} + subdirs = ["files"] diff --git a/files/Android.bp b/files/Android.bp index 9dd6163d..c1aa8c67 100644 --- a/files/Android.bp +++ b/files/Android.bp @@ -1,3 +1,27 @@ +package { + default_applicable_licenses: ["external_libyuv_files_license"], +} + +// Added automatically by a large-scale-change +// +// large-scale-change included anything that looked like it might be a license +// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc. +// +// Please consider removing redundant or irrelevant files from 'license_text:'. +// See: http://go/android-license-faq +license { + name: "external_libyuv_files_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-BSD", + ], + license_text: [ + "LICENSE", + "LICENSE_THIRD_PARTY", + "PATENTS", + ], +} + cc_library { name: "libyuv", vendor_available: true, diff --git a/files/fuzz/Android.bp b/files/fuzz/Android.bp index be3c78e6..0e495899 100644 --- a/files/fuzz/Android.bp +++ b/files/fuzz/Android.bp @@ -1,4 +1,13 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_libyuv_files_license" + // to get the below license kinds: + // SPDX-license-identifier-BSD + default_applicable_licenses: ["external_libyuv_files_license"], +} + cc_fuzz { name: "libyuv_mjpeg_dec_fuzz", host_supported: false, -- cgit v1.2.3