LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Remove module for creating license for gn2bp script" am: 157877a723

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2480255

Change-Id: Ia290575f67b845d8dc5318c1fa11385863c358bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chidera Olibie
2023-03-13 14:01:01 +00:00
committed by Automerger Merge Worker
parent d303bf6069 157877a723
commit c33c67b6ea
2 changed files with 7 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
tools/gn2bp/Android.bp.swp
View File

@@ -16,7 +16,7 @@
build = ["Android.extras.bp"] build = ["Android.extras.bp"]
// GN: PACKAGE // The actual license can be found in Android.extras.bp
package { package {
default_applicable_licenses: [ default_applicable_licenses: [
"external_cronet_license", "external_cronet_license",
@@ -35227,51 +35227,3 @@ cc_genrule {
], ],
} }
// GN: LICENSE
license {
name: "external_cronet_license",
license_kinds: [
"SPDX-license-identifier-AFL-2.0",
"SPDX-license-identifier-Apache-2.0",
"SPDX-license-identifier-BSD",
"SPDX-license-identifier-BSL-1.0",
"SPDX-license-identifier-ICU",
"SPDX-license-identifier-ISC",
"SPDX-license-identifier-MIT",
"SPDX-license-identifier-MPL",
"SPDX-license-identifier-MPL-1.1",
"SPDX-license-identifier-MPL-2.0",
"SPDX-license-identifier-NCSA",
"SPDX-license-identifier-OpenSSL",
"SPDX-license-identifier-Unicode-DFS",
"legacy_unencumbered",
],
license_text: [
"LICENSE",
"base/third_party/double_conversion/LICENSE",
"base/third_party/dynamic_annotations/LICENSE",
"base/third_party/icu/LICENSE",
"base/third_party/nspr/LICENSE",
"base/third_party/superfasthash/LICENSE",
"base/third_party/symbolize/LICENSE",
"base/third_party/valgrind/LICENSE",
"base/third_party/xdg_user_dirs/LICENSE",
"net/third_party/quiche/src/LICENSE",
"net/third_party/uri_template/LICENSE",
"third_party/abseil-cpp/LICENSE",
"third_party/ashmem/LICENSE",
"third_party/boringssl/src/LICENSE",
"third_party/boringssl/src/third_party/fiat/LICENSE",
"third_party/boringssl/src/third_party/googletest/LICENSE",
"third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE",
"third_party/brotli/LICENSE",
"third_party/icu/LICENSE",
"third_party/icu/scripts/LICENSE",
"third_party/libevent/LICENSE",
"third_party/metrics_proto/LICENSE",
"third_party/modp_b64/LICENSE",
"third_party/protobuf/LICENSE",
"third_party/protobuf/third_party/utf8_range/LICENSE",
],
}

54
tools/gn2bp/gen_android_bp
View File

@@ -39,6 +39,8 @@ import gn_utils
ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
CRONET_LICENSE_NAME = "external_cronet_license"
# Default targets to translate to the blueprint file. # Default targets to translate to the blueprint file.
DEFAULT_TARGETS = [ DEFAULT_TARGETS = [
'//components/cronet/android:cronet', '//components/cronet/android:cronet',
@@ -1764,54 +1766,10 @@ def create_blueprint_for_targets(gn, targets, test_targets):
return blueprint return blueprint
def create_license_module(blueprint): def create_default_license_module(blueprint):
module = Module("license", "external_cronet_license", "LICENSE")
module.license_kinds.update({
'SPDX-license-identifier-MPL',
'SPDX-license-identifier-MPL-1.1',
'SPDX-license-identifier-ISC',
'SPDX-license-identifier-AFL-2.0',
'SPDX-license-identifier-MPL-2.0',
'SPDX-license-identifier-BSD',
'SPDX-license-identifier-Apache-2.0',
'SPDX-license-identifier-BSL-1.0',
'SPDX-license-identifier-Unicode-DFS',
'SPDX-license-identifier-NCSA',
'SPDX-license-identifier-OpenSSL',
'SPDX-license-identifier-MIT',
"SPDX-license-identifier-ICU",
'legacy_unencumbered',
})
module.license_text.update({
"LICENSE",
"net/third_party/uri_template/LICENSE",
"net/third_party/quiche/src/LICENSE",
"base/third_party/symbolize/LICENSE",
"base/third_party/superfasthash/LICENSE",
"base/third_party/xdg_user_dirs/LICENSE",
"base/third_party/double_conversion/LICENSE",
"base/third_party/nspr/LICENSE",
"base/third_party/dynamic_annotations/LICENSE",
"base/third_party/icu/LICENSE",
"base/third_party/valgrind/LICENSE",
"third_party/brotli/LICENSE",
"third_party/protobuf/LICENSE",
"third_party/protobuf/third_party/utf8_range/LICENSE",
"third_party/metrics_proto/LICENSE",
"third_party/boringssl/src/LICENSE",
"third_party/boringssl/src/third_party/googletest/LICENSE",
"third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE",
"third_party/boringssl/src/third_party/fiat/LICENSE",
"third_party/libevent/LICENSE",
"third_party/ashmem/LICENSE",
"third_party/icu/LICENSE",
"third_party/icu/scripts/LICENSE",
"third_party/abseil-cpp/LICENSE",
"third_party/modp_b64/LICENSE",
})
default_license = Module("package", "", "PACKAGE") default_license = Module("package", "", "PACKAGE")
default_license.default_applicable_licenses.add(module.name) default_license.comment = "The actual license can be found in Android.extras.bp"
blueprint.add_module(module) default_license.default_applicable_licenses.add(CRONET_LICENSE_NAME)
blueprint.add_module(default_license) blueprint.add_module(default_license)
def main(): def main():
@@ -1866,7 +1824,7 @@ def main():
# Add any proto groups to the blueprint. # Add any proto groups to the blueprint.
for l_name, t_names in proto_groups.items(): for l_name, t_names in proto_groups.items():
create_proto_group_modules(blueprint, gn, l_name, t_names) create_proto_group_modules(blueprint, gn, l_name, t_names)
create_license_module(blueprint) create_default_license_module(blueprint)
output = [ output = [
"""// Copyright (C) 2022 The Android Open Source Project """// Copyright (C) 2022 The Android Open Source Project
// //