StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix licenses and license texts." am: 24b74875e9

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1959641

Change-Id: If87f7a0c312fc1a77c1c251e03b39b65522459df
This commit is contained in:
Treehugger Robot
2022-01-25 05:33:06 +00:00
committed by Automerger Merge Worker
parent a4bb5a404f 24b74875e9
commit d2d11848b9
14 changed files with 1224 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
Android.bp
View File

@@ -1,49 +0,0 @@
//
// 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
}

6
target/product/gsi/Android.bp
View File

@@ -14,11 +14,7 @@
package { package {
// See: http://go/android-license-faq // See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import default_applicable_licenses: ["Android-Apache-2.0"],
// all of the 'license_kinds' from "build_make_license"
// to get the below license kinds:
// legacy_restricted
default_applicable_licenses: ["build_make_license"],
} }
filegroup { filegroup {

30
target/product/gsi/Android.mk
View File

@@ -73,8 +73,9 @@ $(check-vndk-list-timestamp): $(INTERNAL_VNDK_LIB_LIST) $(LATEST_VNDK_LIB_LIST)
# Script to update the latest VNDK lib list # Script to update the latest VNDK lib list
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := update-vndk-list.sh LOCAL_MODULE := update-vndk-list.sh
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_MODULE_CLASS := EXECUTABLES
LOCAL_MODULE_STEM := $(LOCAL_MODULE) LOCAL_MODULE_STEM := $(LOCAL_MODULE)
LOCAL_IS_HOST_MODULE := true LOCAL_IS_HOST_MODULE := true
@@ -170,8 +171,9 @@ ifneq ($(BOARD_VNDK_VERSION),)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := vndk_package LOCAL_MODULE := vndk_package
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
# Filter LLNDK libs moved to APEX to avoid pulling them into /system/LIB # Filter LLNDK libs moved to APEX to avoid pulling them into /system/LIB
LOCAL_REQUIRED_MODULES := \ LOCAL_REQUIRED_MODULES := \
$(filter-out $(LLNDK_MOVED_TO_APEX_LIBRARIES),$(LLNDK_LIBRARIES)) $(filter-out $(LLNDK_MOVED_TO_APEX_LIBRARIES),$(LLNDK_LIBRARIES))
@@ -195,8 +197,9 @@ ifneq ($(BOARD_VNDK_VERSION),current)
_vndk_versions += $(BOARD_VNDK_VERSION) _vndk_versions += $(BOARD_VNDK_VERSION)
endif endif
LOCAL_MODULE := vndk_apex_snapshot_package LOCAL_MODULE := vndk_apex_snapshot_package
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted 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)) LOCAL_REQUIRED_MODULES := $(foreach vndk_ver,$(_vndk_versions),com.android.vndk.v$(vndk_ver))
include $(BUILD_PHONY_PACKAGE) include $(BUILD_PHONY_PACKAGE)
@@ -209,8 +212,9 @@ endif # BOARD_VNDK_VERSION is set
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := gsi_skip_mount.cfg LOCAL_MODULE := gsi_skip_mount.cfg
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_MODULE_STEM := skip_mount.cfg LOCAL_MODULE_STEM := skip_mount.cfg
LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_SRC_FILES := $(LOCAL_MODULE)
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
@@ -234,8 +238,9 @@ include $(BUILD_PREBUILT)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := init.gsi.rc LOCAL_MODULE := init.gsi.rc
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_SRC_FILES := $(LOCAL_MODULE)
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_SYSTEM_EXT_MODULE := true LOCAL_SYSTEM_EXT_MODULE := true
@@ -246,8 +251,9 @@ include $(BUILD_PREBUILT)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := init.vndk-nodef.rc LOCAL_MODULE := init.vndk-nodef.rc
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_SRC_FILES := $(LOCAL_MODULE)
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_SYSTEM_EXT_MODULE := true LOCAL_SYSTEM_EXT_MODULE := true

6
target/product/security/Android.bp
View File

@@ -1,11 +1,7 @@
// AOSP test certificate // AOSP test certificate
package { package {
// See: http://go/android-license-faq // See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import default_applicable_licenses: ["Android-Apache-2.0"],
// all of the 'license_kinds' from "build_make_license"
// to get the below license kinds:
// legacy_restricted
default_applicable_licenses: ["build_make_license"],
} }
android_app_certificate { android_app_certificate {

25
target/product/security/Android.mk
View File

@@ -5,8 +5,9 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := verity_key LOCAL_MODULE := verity_key
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_SRC_FILES := $(LOCAL_MODULE)
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
@@ -26,8 +27,9 @@ include $(BUILD_PREBUILT)
ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true) ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := verity_key_ramdisk LOCAL_MODULE := verity_key_ramdisk
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := verity_key LOCAL_SRC_FILES := verity_key
LOCAL_MODULE_STEM := verity_key LOCAL_MODULE_STEM := verity_key
@@ -41,8 +43,9 @@ ifdef PRODUCT_ADB_KEYS
ifneq ($(filter eng userdebug,$(TARGET_BUILD_VARIANT)),) ifneq ($(filter eng userdebug,$(TARGET_BUILD_VARIANT)),)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := adb_keys LOCAL_MODULE := adb_keys
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
LOCAL_PREBUILT_MODULE_FILE := $(PRODUCT_ADB_KEYS) LOCAL_PREBUILT_MODULE_FILE := $(PRODUCT_ADB_KEYS)
@@ -57,8 +60,9 @@ endif
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := otacerts LOCAL_MODULE := otacerts
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_STEM := otacerts.zip LOCAL_MODULE_STEM := otacerts.zip
LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/security LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/security
@@ -81,8 +85,9 @@ $(LOCAL_BUILT_MODULE): \
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := otacerts.recovery LOCAL_MODULE := otacerts.recovery
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_STEM := otacerts.zip LOCAL_MODULE_STEM := otacerts.zip
LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/system/etc/security LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/system/etc/security

10
tools/Android.bp
View File

@@ -14,15 +14,7 @@
package { package {
// See: http://go/android-license-faq // See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import default_applicable_licenses: ["Android-Apache-2.0"],
// all of the 'license_kinds' from "build_make_license"
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
// SPDX-license-identifier-BSD
// SPDX-license-identifier-CC-BY
// SPDX-license-identifier-GPL
// SPDX-license-identifier-MIT
default_applicable_licenses: ["build_make_license"],
} }
python_binary_host { python_binary_host {

6
tools/acp/Android.bp
View File

@@ -4,11 +4,7 @@
package { package {
// See: http://go/android-license-faq // See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import default_applicable_licenses: ["Android-Apache-2.0"],
// all of the 'license_kinds' from "build_make_license"
// to get the below license kinds:
// legacy_restricted
default_applicable_licenses: ["build_make_license"],
} }
cc_binary_host { cc_binary_host {

6
tools/atree/Android.bp
View File

@@ -4,11 +4,7 @@
package { package {
// See: http://go/android-license-faq // See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import default_applicable_licenses: ["Android-Apache-2.0"],
// all of the 'license_kinds' from "build_make_license"
// to get the below license kinds:
// legacy_restricted
default_applicable_licenses: ["build_make_license"],
} }
cc_binary_host { cc_binary_host {

25
tools/droiddoc/Android.bp
View File

@@ -14,15 +14,22 @@
package { package {
// See: http://go/android-license-faq // See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import default_applicable_licenses: [
// all of the 'license_kinds' from "build_make_license" "Android-Apache-2.0",
// to get the below license kinds: "build_make_tools_droiddoc_license",
// SPDX-license-identifier-Apache-2.0 ],
// SPDX-license-identifier-BSD }
// SPDX-license-identifier-CC-BY
// SPDX-license-identifier-GPL license {
// SPDX-license-identifier-MIT name: "build_make_tools_droiddoc_license",
default_applicable_licenses: ["build_make_license"], package_name: "Android Droiddoc Templates",
license_kinds: [
"SPDX-license-identifier-BSD",
"SPDX-license-identifier-CC-BY-2.5",
"SPDX-license-identifier-GPL-3.0",
"SPDX-license-identifier-MIT",
],
license_text: ["LICENSE"],
} }
droiddoc_exported_dir { droiddoc_exported_dir {

1095
tools/droiddoc/LICENSE Normal file
View File

File diff suppressed because it is too large Load Diff

6
tools/fs_config/Android.bp
View File

@@ -14,11 +14,7 @@
package { package {
// See: http://go/android-license-faq // See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import default_applicable_licenses: ["Android-Apache-2.0"],
// all of the 'license_kinds' from "build_make_license"
// to get the below license kinds:
// legacy_restricted
default_applicable_licenses: ["build_make_license"],
} }
bootstrap_go_package { bootstrap_go_package {

120
tools/fs_config/Android.mk
View File

@@ -57,8 +57,9 @@ fs_config_generate_extra_partition_list := $(strip \
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := fs_config_dirs LOCAL_MODULE := fs_config_dirs
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_REQUIRED_MODULES := \ LOCAL_REQUIRED_MODULES := \
fs_config_dirs_system \ fs_config_dirs_system \
fs_config_dirs_system_ext \ fs_config_dirs_system_ext \
@@ -72,8 +73,9 @@ include $(BUILD_PHONY_PACKAGE)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := fs_config_files LOCAL_MODULE := fs_config_files
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_REQUIRED_MODULES := \ LOCAL_REQUIRED_MODULES := \
fs_config_files_system \ fs_config_files_system \
fs_config_files_system_ext \ fs_config_files_system_ext \
@@ -88,8 +90,9 @@ include $(BUILD_PHONY_PACKAGE)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := fs_config_dirs_system_ext LOCAL_MODULE := fs_config_dirs_system_ext
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_REQUIRED_MODULES := $(if $(BOARD_USES_SYSTEM_EXTIMAGE)$(BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE),_fs_config_dirs_system_ext) LOCAL_REQUIRED_MODULES := $(if $(BOARD_USES_SYSTEM_EXTIMAGE)$(BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE),_fs_config_dirs_system_ext)
include $(BUILD_PHONY_PACKAGE) include $(BUILD_PHONY_PACKAGE)
@@ -100,8 +103,9 @@ include $(BUILD_PHONY_PACKAGE)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := fs_config_files_system_ext LOCAL_MODULE := fs_config_files_system_ext
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_REQUIRED_MODULES := $(if $(BOARD_USES_SYSTEM_EXTIMAGE)$(BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE),_fs_config_files_system_ext) LOCAL_REQUIRED_MODULES := $(if $(BOARD_USES_SYSTEM_EXTIMAGE)$(BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE),_fs_config_files_system_ext)
include $(BUILD_PHONY_PACKAGE) include $(BUILD_PHONY_PACKAGE)
@@ -112,8 +116,9 @@ include $(BUILD_PHONY_PACKAGE)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := fs_config_dirs_product LOCAL_MODULE := fs_config_dirs_product
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_REQUIRED_MODULES := $(if $(BOARD_USES_PRODUCTIMAGE)$(BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE),_fs_config_dirs_product) LOCAL_REQUIRED_MODULES := $(if $(BOARD_USES_PRODUCTIMAGE)$(BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE),_fs_config_dirs_product)
include $(BUILD_PHONY_PACKAGE) include $(BUILD_PHONY_PACKAGE)
@@ -124,8 +129,9 @@ include $(BUILD_PHONY_PACKAGE)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := fs_config_files_product LOCAL_MODULE := fs_config_files_product
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_REQUIRED_MODULES := $(if $(BOARD_USES_PRODUCTIMAGE)$(BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE),_fs_config_files_product) LOCAL_REQUIRED_MODULES := $(if $(BOARD_USES_PRODUCTIMAGE)$(BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE),_fs_config_files_product)
include $(BUILD_PHONY_PACKAGE) include $(BUILD_PHONY_PACKAGE)
@@ -136,8 +142,9 @@ include $(BUILD_PHONY_PACKAGE)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := fs_config_dirs_nonsystem LOCAL_MODULE := fs_config_dirs_nonsystem
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_REQUIRED_MODULES := $(foreach t,$(fs_config_generate_extra_partition_list),_fs_config_dirs_$(t)) LOCAL_REQUIRED_MODULES := $(foreach t,$(fs_config_generate_extra_partition_list),_fs_config_dirs_$(t))
include $(BUILD_PHONY_PACKAGE) include $(BUILD_PHONY_PACKAGE)
@@ -148,8 +155,9 @@ include $(BUILD_PHONY_PACKAGE)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := fs_config_files_nonsystem LOCAL_MODULE := fs_config_files_nonsystem
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_REQUIRED_MODULES := $(foreach t,$(fs_config_generate_extra_partition_list),_fs_config_files_$(t)) LOCAL_REQUIRED_MODULES := $(foreach t,$(fs_config_generate_extra_partition_list),_fs_config_files_$(t))
include $(BUILD_PHONY_PACKAGE) include $(BUILD_PHONY_PACKAGE)
@@ -160,8 +168,9 @@ include $(BUILD_PHONY_PACKAGE)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := fs_config_dirs_system LOCAL_MODULE := fs_config_dirs_system
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs
include $(BUILD_SYSTEM)/base_rules.mk include $(BUILD_SYSTEM)/base_rules.mk
@@ -187,8 +196,9 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_G
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := fs_config_files_system LOCAL_MODULE := fs_config_files_system
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_files LOCAL_INSTALLED_MODULE_STEM := fs_config_files
include $(BUILD_SYSTEM)/base_rules.mk include $(BUILD_SYSTEM)/base_rules.mk
@@ -215,8 +225,9 @@ ifneq ($(filter vendor,$(fs_config_generate_extra_partition_list)),)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := _fs_config_dirs_vendor LOCAL_MODULE := _fs_config_dirs_vendor
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc
@@ -241,8 +252,9 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_G
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := _fs_config_files_vendor LOCAL_MODULE := _fs_config_files_vendor
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_files LOCAL_INSTALLED_MODULE_STEM := fs_config_files
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc
@@ -270,8 +282,9 @@ ifneq ($(filter oem,$(fs_config_generate_extra_partition_list)),)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := _fs_config_dirs_oem LOCAL_MODULE := _fs_config_dirs_oem
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs
LOCAL_MODULE_PATH := $(TARGET_OUT_OEM)/etc LOCAL_MODULE_PATH := $(TARGET_OUT_OEM)/etc
@@ -296,8 +309,9 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_G
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := _fs_config_files_oem LOCAL_MODULE := _fs_config_files_oem
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_files LOCAL_INSTALLED_MODULE_STEM := fs_config_files
LOCAL_MODULE_PATH := $(TARGET_OUT_OEM)/etc LOCAL_MODULE_PATH := $(TARGET_OUT_OEM)/etc
@@ -325,8 +339,9 @@ ifneq ($(filter odm,$(fs_config_generate_extra_partition_list)),)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := _fs_config_dirs_odm LOCAL_MODULE := _fs_config_dirs_odm
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs
LOCAL_MODULE_PATH := $(TARGET_OUT_ODM)/etc LOCAL_MODULE_PATH := $(TARGET_OUT_ODM)/etc
@@ -351,8 +366,9 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_G
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := _fs_config_files_odm LOCAL_MODULE := _fs_config_files_odm
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_files LOCAL_INSTALLED_MODULE_STEM := fs_config_files
LOCAL_MODULE_PATH := $(TARGET_OUT_ODM)/etc LOCAL_MODULE_PATH := $(TARGET_OUT_ODM)/etc
@@ -380,8 +396,9 @@ ifneq ($(filter vendor_dlkm,$(fs_config_generate_extra_partition_list)),)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := _fs_config_dirs_vendor_dlkm LOCAL_MODULE := _fs_config_dirs_vendor_dlkm
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_DLKM)/etc LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_DLKM)/etc
@@ -406,8 +423,9 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_G
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := _fs_config_files_vendor_dlkm LOCAL_MODULE := _fs_config_files_vendor_dlkm
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_files LOCAL_INSTALLED_MODULE_STEM := fs_config_files
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_DLKM)/etc LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_DLKM)/etc
@@ -435,8 +453,9 @@ ifneq ($(filter odm_dlkm,$(fs_config_generate_extra_partition_list)),)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := _fs_config_dirs_odm_dlkm LOCAL_MODULE := _fs_config_dirs_odm_dlkm
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs
LOCAL_MODULE_PATH := $(TARGET_OUT_ODM_DLKM)/etc LOCAL_MODULE_PATH := $(TARGET_OUT_ODM_DLKM)/etc
@@ -461,8 +480,9 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_G
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := _fs_config_files_odm_dlkm LOCAL_MODULE := _fs_config_files_odm_dlkm
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_files LOCAL_INSTALLED_MODULE_STEM := fs_config_files
LOCAL_MODULE_PATH := $(TARGET_OUT_ODM_DLKM)/etc LOCAL_MODULE_PATH := $(TARGET_OUT_ODM_DLKM)/etc
@@ -490,8 +510,9 @@ ifneq ($(BOARD_USES_PRODUCTIMAGE)$(BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE),)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := _fs_config_dirs_product LOCAL_MODULE := _fs_config_dirs_product
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs
LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/etc LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/etc
@@ -516,8 +537,9 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_G
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := _fs_config_files_product LOCAL_MODULE := _fs_config_files_product
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_files LOCAL_INSTALLED_MODULE_STEM := fs_config_files
LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/etc LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/etc
@@ -544,8 +566,9 @@ ifneq ($(BOARD_USES_SYSTEM_EXTIMAGE)$(BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE),)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := _fs_config_dirs_system_ext LOCAL_MODULE := _fs_config_dirs_system_ext
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs
LOCAL_MODULE_PATH := $(TARGET_OUT_SYSTEM_EXT)/etc LOCAL_MODULE_PATH := $(TARGET_OUT_SYSTEM_EXT)/etc
@@ -570,8 +593,9 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_G
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := _fs_config_files_system_ext LOCAL_MODULE := _fs_config_files_system_ext
LOCAL_LICENSE_KINDS := legacy_restricted LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := restricted LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_files LOCAL_INSTALLED_MODULE_STEM := fs_config_files
LOCAL_MODULE_PATH := $(TARGET_OUT_SYSTEM_EXT)/etc LOCAL_MODULE_PATH := $(TARGET_OUT_SYSTEM_EXT)/etc

6
tools/fs_get_stats/Android.bp
View File

@@ -1,10 +1,6 @@
package { package {
// See: http://go/android-license-faq // See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import default_applicable_licenses: ["Android-Apache-2.0"],
// all of the 'license_kinds' from "build_make_license"
// to get the below license kinds:
// legacy_restricted
default_applicable_licenses: ["build_make_license"],
} }
cc_binary_host { cc_binary_host {

6
tools/libhost/Android.bp
View File

@@ -1,10 +1,6 @@
package { package {
// See: http://go/android-license-faq // See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import default_applicable_licenses: ["Android-Apache-2.0"],
// all of the 'license_kinds' from "build_make_license"
// to get the below license kinds:
// legacy_restricted
default_applicable_licenses: ["build_make_license"],
} }
cc_library_host_static { cc_library_host_static {