Merge "trusty: update default_applicable_licenses "Android-Apache-2.0"" am:... (3cf47897) · Commits · e / os / android_system_core

trusty/Android.bp

+1 −25

Original line number	Diff line number	Diff line
		@@ -14,29 +14,5 @@
		// limitations under the License.

		package {
		default_applicable_licenses: ["system_core_trusty_license"],
		}

		// 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
		default_applicable_licenses: ["Android-Apache-2.0"],
		}

trusty/utils/rpmb_dev/Android.bp

+1 −7

Original line number	Diff line number	Diff line
		@@ -12,13 +12,7 @@
		// limitations under the License.

		package {
		// See: http://go/android-license-faq
		// 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"],
		default_applicable_licenses: ["Android-Apache-2.0"],
		}

		cc_binary {

trusty/utils/rpmb_dev/rpmb_dev.c

+9 −17

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 The Android Open Source Project
		*
		* Permission is hereby granted, free of charge, to any person
		* obtaining a copy of this software and associated documentation
		* files (the "Software"), to deal in the Software without
		* 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:
		* 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
		*
		* The above copyright notice and this permission notice shall be
		* included in all copies or substantial portions of the Software.
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
		* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
		* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
		* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
		* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
		* 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.
		* 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.
		*/

		#define LOG_TAG "rpmb_mock"