ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

trusty: update default_applicable_licenses "Android-Apache-2.0"

Browse source 
rpmb_dev is a rpmb device stub used in emulation
as well as platform early bringup so we don't expect
any open source developer to be impacted by the migration
from MIT to Apache 2.0.
Note that with such a migration to Apache 2.0, recipients
won't receive lesser permissions, they just have updated
requirements for which license text to share along with the code.

Bug: 191508826
Test: None
Signed-off-by: Armelle Laine <armellel@google.com>
Change-Id: I0ae2bc66901344f8f9227e929a98946e52c50355
This commit is contained in:
Armelle Laine 2021-11-08 04:28:31 +00:00
parent d0a4e710e9
commit c2cc120d60
3 changed files with 11 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
trusty/Android.bp
View file

@ -14,29 +14,5 @@
// limitations under the License. // limitations under the License.
package { package {
default_applicable_licenses: ["system_core_trusty_license"], default_applicable_licenses: ["Android-Apache-2.0"],
}
// Added automatically by a large-scale-change that took the approach of
// 'apply every license found to every target'. While this makes sure we respect
// every license restriction, it may not be entirely correct.
//
// e.g. GPL in an MIT project might only apply to the contrib/ directory.
//
// Please consider splitting the single license below into multiple licenses,
// taking care not to lose any license_kind information, and overriding the
// default license using the 'licenses: [...]' property on targets as needed.
//
// For unused files, consider creating a 'fileGroup' with "//visibility:private"
// to attach the license to, and including a comment whether the files may be
// used in the current project.
// See: http://go/android-license-faq
license {
name: "system_core_trusty_license",
visibility: [":__subpackages__"],
license_kinds: [
"SPDX-license-identifier-Apache-2.0",
"SPDX-license-identifier-MIT",
],
// large-scale-change unable to identify any license_text files
} }

8
trusty/utils/rpmb_dev/Android.bp
View file

@ -12,13 +12,7 @@
// limitations under the License. // limitations under the License.
package { package {
// See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"],
// A large-scale-change added 'default_applicable_licenses' to import
// all of the 'license_kinds' from "system_core_trusty_license"
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
// SPDX-license-identifier-MIT
default_applicable_licenses: ["system_core_trusty_license"],
} }
cc_binary { cc_binary {

26
trusty/utils/rpmb_dev/rpmb_dev.c
View file

@ -1,25 +1,17 @@
/* /*
* Copyright (C) 2018 The Android Open Source Project * Copyright (C) 2018 The Android Open Source Project
* *
* Permission is hereby granted, free of charge, to any person * Licensed under the Apache License, Version 2.0 (the "License");
* obtaining a copy of this software and associated documentation * you may not use this file except in compliance with the License.
* files (the "Software"), to deal in the Software without * You may obtain a copy of the License at
* restriction, including without limitation the rights to use, copy,
* modify, merge, publish, distribute, sublicense, and/or sell copies
* of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
* The above copyright notice and this permission notice shall be * http://www.apache.org/licenses/LICENSE-2.0
* included in all copies or substantial portions of the Software.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * Unless required by applicable law or agreed to in writing, software
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * distributed under the License is distributed on an "AS IS" BASIS,
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS * See the License for the specific language governing permissions and
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN * limitations under the License.
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/ */
#define LOG_TAG "rpmb_mock" #define LOG_TAG "rpmb_mock"