Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e12fcf1f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "UltraHDR: Add Adobe HDR gain map notice" into udc-dev am: 6c5d50bf am: cd35f59c

parents 2744f0f9 cd35f59c
Loading
Loading
Loading
Loading
+4 −5
Original line number Diff line number Diff line
@@ -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 {
+19 −0
Original line number Diff line number Diff line
// 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"],
}
+1 −0
Original line number Diff line number Diff line
This product includes Gain Map technology under license by Adobe.