gn2bp: Use "out" prefix for src path filtering
instead of "out/test".
Test: ./update_results.sh
Change-Id: I28fd863742f2531bb942a15c636ca311ef45c307
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index deb8f8a..7606aaa 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -1313,14 +1313,14 @@
module.srcs.update(
gn_utils.label_to_path(src)
for src in target.sources
- if is_supported_source_file(src) and not src.startswith("//out/test"))
+ if is_supported_source_file(src) and not src.startswith("//out/"))
# Add arch-specific properties
for arch_name, arch in target.arch.items():
module.target[arch_name].srcs.update(
gn_utils.label_to_path(src)
for src in arch.sources
- if is_supported_source_file(src) and not src.startswith("//out/test"))
+ if is_supported_source_file(src) and not src.startswith("//out/"))
module.rtti = target.rtti
diff --git a/tools/gn2bp/gn_utils.py b/tools/gn2bp/gn_utils.py
index e5d2bf4..3d709e5 100644
--- a/tools/gn2bp/gn_utils.py
+++ b/tools/gn2bp/gn_utils.py
@@ -78,7 +78,7 @@
return name
def _is_java_source(src):
- return os.path.splitext(src)[1] == '.java' and not src.startswith("//out/test/gen/")
+ return os.path.splitext(src)[1] == '.java' and not src.startswith("//out/")
def is_java_action(script, outputs):
return (script != "" and script not in JAVA_BANNED_SCRIPTS) and any(