diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2023-07-21 15:30:56 -0700 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-28 01:50:44 +0000 |
| commit | c25d8b872b161e65899a1c85a016f2bee15c660e (patch) | |
| tree | 598ca0c196cb26dfb5a7d89c27de174383a8946d | |
| parent | e0aab277f7686500c1c9855f24f5785f2891bca9 (diff) | |
| download | native-c25d8b872b161e65899a1c85a016f2bee15c660e.tar.gz | |
UltraHDR: Add Adobe HDR gain map notice
Bug: 292284515
Test: Builds
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9438cea895cc19d5d80e1af4b18b437d1bfe8277)
Merged-In: Ifd263d93e1c1b8bb8043712283e38e4434079f85
Change-Id: Ifd263d93e1c1b8bb8043712283e38e4434079f85
| -rw-r--r-- | libs/ultrahdr/Android.bp | 9 | ||||
| -rw-r--r-- | libs/ultrahdr/adobe-hdr-gain-map-license/Android.bp | 19 | ||||
| -rw-r--r-- | libs/ultrahdr/adobe-hdr-gain-map-license/NOTICE | 1 |
3 files changed, 24 insertions, 5 deletions
diff --git a/libs/ultrahdr/Android.bp b/libs/ultrahdr/Android.bp index e3f709b7f5..9deba01dc8 100644 --- a/libs/ultrahdr/Android.bp +++ b/libs/ultrahdr/Android.bp @@ -14,11 +14,10 @@ package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "frameworks_native_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["frameworks_native_license"], + default_applicable_licenses: [ + "frameworks_native_license", + "adobe_hdr_gain_map_license", + ], } cc_library { diff --git a/libs/ultrahdr/adobe-hdr-gain-map-license/Android.bp b/libs/ultrahdr/adobe-hdr-gain-map-license/Android.bp new file mode 100644 index 0000000000..e999a8bd28 --- /dev/null +++ b/libs/ultrahdr/adobe-hdr-gain-map-license/Android.bp @@ -0,0 +1,19 @@ +// Copyright 2023 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +license { + name: "adobe_hdr_gain_map_license", + license_kinds: ["legacy_by_exception_only"], + license_text: ["NOTICE"], +} diff --git a/libs/ultrahdr/adobe-hdr-gain-map-license/NOTICE b/libs/ultrahdr/adobe-hdr-gain-map-license/NOTICE new file mode 100644 index 0000000000..3f6c5944c7 --- /dev/null +++ b/libs/ultrahdr/adobe-hdr-gain-map-license/NOTICE @@ -0,0 +1 @@ +This product includes Gain Map technology under license by Adobe. |