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

Commit d2c7c08e authored by Bob Badour's avatar Bob Badour
Browse files

Fix licenses and license texts. 

Use Android-Apache-2.0 for all Apache 2.0

Remove legacy_restricted (no longer appears in code).

Remove Android.bp which did not build anything but was a placeholder
for the missing license texts.

Test: m nothing
Change-Id: Ia491a59c735ca20afda9b4bbac9d8b33dbf8874e
parent 4724f77b

Android.bp

deleted100644 → 0
+0 −49
Original line number Diff line number Diff line 
//

// Copyright (C) 2021 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.



package {

    default_applicable_licenses: ["build_make_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: "build_make_license",

    visibility: [":__subpackages__"],

    license_kinds: [

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

        "SPDX-license-identifier-BSD",

        "SPDX-license-identifier-CC-BY",

        "SPDX-license-identifier-GPL",

        "SPDX-license-identifier-GPL-2.0",

        "SPDX-license-identifier-LGPL",

        "SPDX-license-identifier-MIT",

        "legacy_not_a_contribution",

        "legacy_restricted",

    ],

    // large-scale-change unable to identify any license_text files

}

target/product/gsi/Android.bp

+1 −5
Original line number Diff line number Diff line
@@ -14,11 +14,7 @@ 


package {

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

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "build_make_license"

    // to get the below license kinds:

    //   legacy_restricted

    default_applicable_licenses: ["build_make_license"],

    default_applicable_licenses: ["Android-Apache-2.0"],

}



filegroup {

target/product/gsi/Android.mk

+18 −12
Original line number Diff line number Diff line
@@ -73,8 +73,9 @@ $(check-vndk-list-timestamp): $(INTERNAL_VNDK_LIB_LIST) $(LATEST_VNDK_LIB_LIST) 
# Script to update the latest VNDK lib list

include $(CLEAR_VARS)

LOCAL_MODULE := update-vndk-list.sh

LOCAL_LICENSE_KINDS := legacy_restricted

LOCAL_LICENSE_CONDITIONS := restricted

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

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE

LOCAL_MODULE_CLASS := EXECUTABLES

LOCAL_MODULE_STEM := $(LOCAL_MODULE)

LOCAL_IS_HOST_MODULE := true
@@ -170,8 +171,9 @@ ifneq ($(BOARD_VNDK_VERSION),) 


include $(CLEAR_VARS)

LOCAL_MODULE := vndk_package

LOCAL_LICENSE_KINDS := legacy_restricted

LOCAL_LICENSE_CONDITIONS := restricted

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

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE

# Filter LLNDK libs moved to APEX to avoid pulling them into /system/LIB

LOCAL_REQUIRED_MODULES := \

    $(filter-out $(LLNDK_MOVED_TO_APEX_LIBRARIES),$(LLNDK_LIBRARIES))
@@ -195,8 +197,9 @@ ifneq ($(BOARD_VNDK_VERSION),current) 
	_vndk_versions += $(BOARD_VNDK_VERSION)

endif

LOCAL_MODULE := vndk_apex_snapshot_package

LOCAL_LICENSE_KINDS := legacy_restricted

LOCAL_LICENSE_CONDITIONS := restricted

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

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE

LOCAL_REQUIRED_MODULES := $(foreach vndk_ver,$(_vndk_versions),com.android.vndk.v$(vndk_ver))

include $(BUILD_PHONY_PACKAGE)
@@ -209,8 +212,9 @@ endif # BOARD_VNDK_VERSION is set 


include $(CLEAR_VARS)

LOCAL_MODULE := gsi_skip_mount.cfg

LOCAL_LICENSE_KINDS := legacy_restricted

LOCAL_LICENSE_CONDITIONS := restricted

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

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE

LOCAL_MODULE_STEM := skip_mount.cfg

LOCAL_SRC_FILES := $(LOCAL_MODULE)

LOCAL_MODULE_CLASS := ETC
@@ -234,8 +238,9 @@ include $(BUILD_PREBUILT) 


include $(CLEAR_VARS)

LOCAL_MODULE := init.gsi.rc

LOCAL_LICENSE_KINDS := legacy_restricted

LOCAL_LICENSE_CONDITIONS := restricted

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

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE

LOCAL_SRC_FILES := $(LOCAL_MODULE)

LOCAL_MODULE_CLASS := ETC

LOCAL_SYSTEM_EXT_MODULE := true
@@ -246,8 +251,9 @@ include $(BUILD_PREBUILT) 


include $(CLEAR_VARS)

LOCAL_MODULE := init.vndk-nodef.rc

LOCAL_LICENSE_KINDS := legacy_restricted

LOCAL_LICENSE_CONDITIONS := restricted

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

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE

LOCAL_SRC_FILES := $(LOCAL_MODULE)

LOCAL_MODULE_CLASS := ETC

LOCAL_SYSTEM_EXT_MODULE := true

target/product/security/Android.bp

+1 −5
Original line number Diff line number Diff line 
// AOSP test certificate

package {

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

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "build_make_license"

    // to get the below license kinds:

    //   legacy_restricted

    default_applicable_licenses: ["build_make_license"],

    default_applicable_licenses: ["Android-Apache-2.0"],

}



android_app_certificate {

target/product/security/Android.mk

+15 −10
Original line number Diff line number Diff line
@@ -5,8 +5,9 @@ LOCAL_PATH:= $(call my-dir) 
include $(CLEAR_VARS)



LOCAL_MODULE := verity_key

LOCAL_LICENSE_KINDS := legacy_restricted

LOCAL_LICENSE_CONDITIONS := restricted

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

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE

LOCAL_SRC_FILES := $(LOCAL_MODULE)

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
@@ -26,8 +27,9 @@ include $(BUILD_PREBUILT) 
ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)

  include $(CLEAR_VARS)

  LOCAL_MODULE := verity_key_ramdisk

  LOCAL_LICENSE_KINDS := legacy_restricted

  LOCAL_LICENSE_CONDITIONS := restricted

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

  LOCAL_LICENSE_CONDITIONS := notice

  LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE

  LOCAL_MODULE_CLASS := ETC

  LOCAL_SRC_FILES := verity_key

  LOCAL_MODULE_STEM := verity_key
@@ -41,8 +43,9 @@ ifdef PRODUCT_ADB_KEYS 
  ifneq ($(filter eng userdebug,$(TARGET_BUILD_VARIANT)),)

    include $(CLEAR_VARS)

    LOCAL_MODULE := adb_keys

    LOCAL_LICENSE_KINDS := legacy_restricted

    LOCAL_LICENSE_CONDITIONS := restricted

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

    LOCAL_LICENSE_CONDITIONS := notice

    LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE

    LOCAL_MODULE_CLASS := ETC

    LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)

    LOCAL_PREBUILT_MODULE_FILE := $(PRODUCT_ADB_KEYS)
@@ -57,8 +60,9 @@ endif 
include $(CLEAR_VARS)



LOCAL_MODULE := otacerts

LOCAL_LICENSE_KINDS := legacy_restricted

LOCAL_LICENSE_CONDITIONS := restricted

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

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_STEM := otacerts.zip

LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/security
@@ -81,8 +85,9 @@ $(LOCAL_BUILT_MODULE): \ 
include $(CLEAR_VARS)



LOCAL_MODULE := otacerts.recovery

LOCAL_LICENSE_KINDS := legacy_restricted

LOCAL_LICENSE_CONDITIONS := restricted

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

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_STEM := otacerts.zip

LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/system/etc/security