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

gn2bp: Add .aidl files to the srcs of java_library

Browse Source 
Test: ./update_results.sh
Change-Id: I9c31fdb13752c5123bc5c47207982322b421b739
This commit is contained in:
Motomu Utsumi
2022-12-05 17:51:40 +09:00
parent 3dbc2766a9
commit 6e51412de6
3 changed files with 11 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2363,36 +2363,6 @@ java_genrule {
],
}
// GN: //base:base_java_aidl
java_genrule {
name: "cronet_aml_base_base_java_aidl",
cmd: "$(location build/android/gyp/aidl.py) --aidl-path " +
"../../third_party/android_sdk/public/build-tools/33.0.0/aidl " +
"--imports " +
"[\"../../third_party/android_sdk/public/platforms/android-33/framework.aidl\"] " +
"--srcjar " +
"gen/base/base_java_aidl.srcjar " +
"--depfile " +
"gen/base/base_java_aidl.d " +
"--includes " +
"[\"../../base/android/java/src\"] " +
"../../base/android/java/src/org/chromium/base/process_launcher/IChildProcessService.aidl " +
"../../base/android/java/src/org/chromium/base/process_launcher/IParentProcess.aidl",
out: [
"base/base_java_aidl.srcjar",
],
tool_files: [
"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",
],
}
// GN: //base:base_jni_headers__android_arm
cc_genrule {
name: "cronet_aml_base_base_jni_headers__android_arm",
@@ -9652,6 +9622,8 @@ java_library {
"base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionFactory.java",
"base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionImpl.java",
"base/android/java/src/org/chromium/base/process_launcher/FileDescriptorInfo.java",
"base/android/java/src/org/chromium/base/process_launcher/IChildProcessService.aidl",
"base/android/java/src/org/chromium/base/process_launcher/IParentProcess.aidl",
"base/android/java/src/org/chromium/base/supplier/BooleanSupplier.java",
"base/android/java/src/org/chromium/base/supplier/DestroyableObservableSupplier.java",
"base/android/java/src/org/chromium/base/supplier/ObservableSupplier.java",

3
tools/gn2bp/gen_android_bp
View File

@@ -1266,7 +1266,8 @@ def update_jni_registration_module(module, gn):
# TODO: java_sources might not contain all the required java files
module.srcs.update([gn_utils.label_to_path(source)
for source in gn.java_sources if source not in deny_list])
for source in gn.java_sources
if source.endswith('.java') and source not in deny_list])
def create_blueprint_for_targets(gn, targets):
"""Generate a blueprint for a list of GN targets."""

8
tools/gn2bp/gn_utils.py
View File

@@ -429,7 +429,13 @@ class GnParser(object):
java_srcs = [src for src in dep.inputs if _is_java_source(src)]
self.java_sources.update(java_srcs)
if dep.type in ["action"] and target.type == "java_group":
self.java_actions.add(dep.name)
# //base:base_java_aidl generates srcjar from .aidl files. But java_library in soong can
# directly have .aidl files in srcs. So adding .aidl files to the java_sources.
# TODO: Find a better way/place to do this.
if dep.name == '//base:base_java_aidl':
self.java_sources.update(dep.arch[arch].sources)
else:
self.java_actions.add(dep.name)
return target
def get_proto_exports(self, proto_desc):