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

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

Merge "[LSC] Add LOCAL_LICENSE_KINDS to bootable/recovery" am: 1055a2f0 am:... 

Merge "[LSC] Add LOCAL_LICENSE_KINDS to bootable/recovery" am: 1055a2f0 am: d9a0aa10 am: d2b1584e

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1589034

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9f490244e12cb73a2badde240f95a08e5d2021fe
parents 07a764a8 d2b1584e

Android.bp

+34 −0
Original line number Diff line number Diff line
@@ -12,6 +12,40 @@ 
// See the License for the specific language governing permissions and

// limitations under the License.



// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS.  PLEASE

//     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE

//     DEPENDING ON IT IN YOUR PROJECT. ***

package {

    default_applicable_licenses: ["bootable_recovery_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: "bootable_recovery_license",

    visibility: [":__subpackages__"],

    license_kinds: [

        "SPDX-license-identifier-Apache-2.0",

        "SPDX-license-identifier-MIT",

        "SPDX-license-identifier-OFL", // by exception only

    ],

    license_text: [

        "NOTICE",

    ],

}



cc_defaults {

    name: "recovery_defaults",

Android.mk

+6 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ TARGET_RECOVERY_UI_LIB ?= librecovery_ui_default 
include $(CLEAR_VARS)



LOCAL_MODULE := librecovery_ui_ext

LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT SPDX-license-identifier-OFL

LOCAL_LICENSE_CONDITIONS := by_exception_only notice

LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE



# LOCAL_MODULE_PATH for shared libraries is unsupported in multiarch builds.

LOCAL_MULTILIB := first
@@ -54,6 +57,9 @@ include $(BUILD_SHARED_LIBRARY) 
include $(CLEAR_VARS)



LOCAL_MODULE := recovery_deps

LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT SPDX-license-identifier-OFL

LOCAL_LICENSE_CONDITIONS := by_exception_only notice

LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE



ifeq ($(TARGET_USERIMAGES_USE_F2FS),true)

LOCAL_REQUIRED_MODULES += \

applypatch/Android.bp

+17 −0
Original line number Diff line number Diff line
@@ -12,6 +12,23 @@ 
// See the License for the specific language governing permissions and

// limitations under the License.



package {

    default_applicable_licenses: ["bootable_recovery_applypatch_license"],

}



// Added automatically by a large-scale-change

// See: http://go/android-license-faq

license {

    name: "bootable_recovery_applypatch_license",

    visibility: [":__subpackages__"],

    license_kinds: [

        "SPDX-license-identifier-Apache-2.0",

    ],

    license_text: [

        "NOTICE",

    ],

}



cc_defaults {

    name: "applypatch_defaults",

bootloader_message/Android.bp

+9 −0
Original line number Diff line number Diff line
@@ -14,6 +14,15 @@ 
// 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 "bootable_recovery_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["bootable_recovery_license"],

}



cc_defaults {

    name: "libbootloader_message_defaults",

    srcs: ["bootloader_message.cpp"],

edify/Android.bp

+9 −0
Original line number Diff line number Diff line
@@ -12,6 +12,15 @@ 
// See the License for the specific language governing permissions and

// 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 "bootable_recovery_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["bootable_recovery_license"],

}



cc_library_static {

    name: "libedify",