diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-07-27 18:16:26 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-07-27 18:16:26 +0000 |
commit | e1c5163479ef3b88838dc8c370150e93cb0441e0 (patch) | |
tree | adb3ce74ab4d86db45dfea5a1db0d85c44586782 | |
parent | 4546de0814ce7fdd0afed47c5ef833788cb1d79e (diff) | |
parent | 6c5d50bfee407e275c4efc2a6389a27b7b154a14 (diff) | |
download | native-e1c5163479ef3b88838dc8c370150e93cb0441e0.tar.gz |
Merge "UltraHDR: Add Adobe HDR gain map notice" into udc-dev am: 6c5d50bfee
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/24168505
Change-Id: Id5525d92a7cc80aefd78ef450cc4cbda20b2c19a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-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. |