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

Merge "gn2bp: Add _is_java_source method" am: f9fa2bb224

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

Change-Id: I81349a554683b536223ac28a5b6aa2d292965e69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Motomu Utsumi
2022-11-25 02:43:07 +00:00
committed by Automerger Merge Worker
parent 0affc39da5 f9fa2bb224
commit 9ebef1917c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/gn2bp/gn_utils.py
View File

@@ -69,6 +69,8 @@ def label_to_target_name_with_path(label):
name = re.sub(r'[^a-zA-Z0-9_]', '_', name)
return name
def _is_java_source(src):
return os.path.splitext(src)[1] == '.java' and not src.startswith("//out/test/gen/")
class GnParser(object):
"""A parser with some cleverness for GN json desc files
@@ -399,8 +401,7 @@ class GnParser(object):
if re.match(DEX_REGEX, target.name):
if re.match(COMPILE_JAVA_REGEX, dep.name):
log.debug('Adding java sources for %s', dep.name)
java_srcs = [src for src in dep.inputs
if os.path.splitext(src)[1] == '.java' and not src.startswith("//out/test/gen/")]
java_srcs = [src for src in dep.inputs if _is_java_source(src)]
self.java_sources.update(java_srcs)
return target