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

gn2bp: Fix to use target sources and inputs

Browse Source 
`a or b` does not return the union of set a and set b.
Test: ./update_results.sh

Change-Id: I8ba2f2a96e036bab362cbb7015cc6da048e12024
This commit is contained in:
Motomu Utsumi
2022-12-05 12:45:22 +09:00
parent 07027f6e85
commit 047831e03a
2 changed files with 64 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2356,6 +2356,10 @@ java_genrule {
"base/metrics/histogram_base.h",
"base/task/task_traits.h",
"build/android/gyp/java_cpp_enum.py",
"build/android/gyp/util/__init__.py",
"build/android/gyp/util/build_utils.py",
"build/android/gyp/util/java_cpp_utils.py",
"build/gn_helpers.py",
],
}
@@ -2381,6 +2385,11 @@ java_genrule {
"base/android/java/src/org/chromium/base/process_launcher/IChildProcessService.aidl",
"base/android/java/src/org/chromium/base/process_launcher/IParentProcess.aidl",
"build/android/gyp/aidl.py",
"build/android/gyp/util/__init__.py",
"build/android/gyp/util/build_utils.py",
"build/gn_helpers.py",
"third_party/android_sdk/public/build-tools/33.0.0/aidl",
"third_party/android_sdk/public/platforms/android-33/framework.aidl",
],
}
@@ -4243,6 +4252,10 @@ java_genrule {
tool_files: [
"base/android/java/src/org/chromium/base/BaseFeatures.java.tmpl",
"build/android/gyp/java_cpp_features.py",
"build/android/gyp/util/__init__.py",
"build/android/gyp/util/build_utils.py",
"build/android/gyp/util/java_cpp_utils.py",
"build/gn_helpers.py",
],
}
@@ -4263,6 +4276,10 @@ java_genrule {
tool_files: [
"base/android/java/src/org/chromium/base/BaseSwitches.java.tmpl",
"build/android/gyp/java_cpp_strings.py",
"build/android/gyp/util/__init__.py",
"build/android/gyp/util/build_utils.py",
"build/android/gyp/util/java_cpp_utils.py",
"build/gn_helpers.py",
],
}
@@ -5698,7 +5715,10 @@ java_genrule {
],
tool_files: [
"build/android/gyp/gcc_preprocess.py",
"build/android/gyp/util/__init__.py",
"build/android/gyp/util/build_utils.py",
"build/android/java/templates/BuildConfig.template",
"build/gn_helpers.py",
],
}
@@ -7829,6 +7849,10 @@ java_genrule {
],
tool_files: [
"build/android/gyp/java_cpp_enum.py",
"build/android/gyp/util/__init__.py",
"build/android/gyp/util/build_utils.py",
"build/android/gyp/util/java_cpp_utils.py",
"build/gn_helpers.py",
"components/cronet/url_request_context_config.h",
],
}
@@ -7870,6 +7894,9 @@ java_genrule {
],
tool_files: [
"build/android/gyp/gcc_preprocess.py",
"build/android/gyp/util/__init__.py",
"build/android/gyp/util/build_utils.py",
"build/gn_helpers.py",
"components/cronet/android/java/src/org/chromium/net/impl/IntegratedModeState.template",
],
}
@@ -7911,7 +7938,11 @@ java_genrule {
],
tool_files: [
"build/android/gyp/gcc_preprocess.py",
"build/android/gyp/util/__init__.py",
"build/android/gyp/util/build_utils.py",
"build/gn_helpers.py",
"components/cronet/android/java/src/org/chromium/net/impl/LoadState.template",
"net/base/load_states_list.h",
],
}
@@ -7926,6 +7957,10 @@ java_genrule {
],
tool_files: [
"build/android/gyp/java_cpp_enum.py",
"build/android/gyp/util/__init__.py",
"build/android/gyp/util/build_utils.py",
"build/android/gyp/util/java_cpp_utils.py",
"build/gn_helpers.py",
"net/base/idempotency.h",
],
}
@@ -7941,6 +7976,10 @@ java_genrule {
],
tool_files: [
"build/android/gyp/java_cpp_enum.py",
"build/android/gyp/util/__init__.py",
"build/android/gyp/util/build_utils.py",
"build/android/gyp/util/java_cpp_utils.py",
"build/gn_helpers.py",
"net/base/request_priority.h",
],
}
@@ -7956,6 +7995,10 @@ java_genrule {
],
tool_files: [
"build/android/gyp/java_cpp_enum.py",
"build/android/gyp/util/__init__.py",
"build/android/gyp/util/build_utils.py",
"build/android/gyp/util/java_cpp_utils.py",
"build/gn_helpers.py",
"net/nqe/network_quality_observation_source.h",
],
}
@@ -7971,6 +8014,10 @@ java_genrule {
],
tool_files: [
"build/android/gyp/java_cpp_enum.py",
"build/android/gyp/util/__init__.py",
"build/android/gyp/util/build_utils.py",
"build/android/gyp/util/java_cpp_utils.py",
"build/gn_helpers.py",
"net/nqe/network_quality.h",
],
}
@@ -7986,6 +8033,10 @@ java_genrule {
],
tool_files: [
"build/android/gyp/java_cpp_enum.py",
"build/android/gyp/util/__init__.py",
"build/android/gyp/util/build_utils.py",
"build/android/gyp/util/java_cpp_utils.py",
"build/gn_helpers.py",
"components/cronet/android/url_request_error.h",
],
}
@@ -9765,6 +9816,10 @@ java_genrule {
],
tool_files: [
"build/android/gyp/java_cpp_enum.py",
"build/android/gyp/util/__init__.py",
"build/android/gyp/util/build_utils.py",
"build/android/gyp/util/java_cpp_utils.py",
"build/gn_helpers.py",
"net/android/cert_verify_result_android.h",
"net/android/keystore.h",
"net/base/network_change_notifier.h",
@@ -9784,7 +9839,11 @@ java_genrule {
],
tool_files: [
"build/android/gyp/gcc_preprocess.py",
"build/android/gyp/util/__init__.py",
"build/android/gyp/util/build_utils.py",
"build/gn_helpers.py",
"net/android/java/NetError.template",
"net/base/net_error_list.h",
],
}
@@ -11090,6 +11149,10 @@ java_genrule {
],
tool_files: [
"build/android/gyp/java_cpp_enum.py",
"build/android/gyp/util/__init__.py",
"build/android/gyp/util/build_utils.py",
"build/android/gyp/util/java_cpp_utils.py",
"build/gn_helpers.py",
"net/nqe/effective_connection_type.h",
],
}

2
tools/gn2bp/gen_android_bp
View File

@@ -959,7 +959,7 @@ def create_action_module(blueprint, target, type):
# gn treats inputs and sources for actions equally.
# soong only supports source files inside srcs, non-source files are added as
# tool_files dependency.
for it in target.sources or target.inputs:
for it in target.sources.union(target.inputs):
if is_supported_source_file(it):
module.srcs.add(gn_utils.label_to_path(it))
else: