gn2bp: Use list for cflag_allowlist
This CL also removes unnecessary cflag allowlist
Test: ./update_results.sh
Change-Id: I7bb22856e7fc913d3f6c456eb9034acc43811236
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 40793da..949dfef 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -107,7 +107,8 @@
android_protobuf_src = 'external/protobuf/src'
# Compiler flags which are passed through to the blueprint.
-cflag_allowlist = r'^-DPERFETTO.*$'
+cflag_allowlist = [
+]
# Additional arguments to apply to Android.bp rules.
additional_args = {
@@ -1017,7 +1018,7 @@
def _get_cflags(target):
- cflags = {flag for flag in target.cflags if re.match(cflag_allowlist, flag)}
+ cflags = {flag for flag in target.cflags if flag in cflag_allowlist}
# Consider proper allowlist or denylist if needed
cflags |= set("-D%s" % define.replace("\"", "\\\"") for define in target.defines)
# -DANDROID is added by default but target.defines contain -DANDROID if it's required.