gn2bp: unconditionally remove -DANDROID for all host targets
It turns out, -DANDROID was not consistently applied across the chromium
code base, so it was removed for some targets where it shouldn't have
been.
Adding it to the host defaults solves this problem.
Test: //components/android/cronet:cronet
Change-Id: Ieff81727410c47a0d90d22b56348c6773f653a25
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index cf8a4fd..ac54f64 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -959,12 +959,6 @@
cflags = {flag for flag in cflags if flag in cflag_allowlist}
# Consider proper allowlist or denylist if needed
cflags |= set("-D%s" % define.replace("\"", "\\\"") for define in defines)
- # -DANDROID is added by default but target.defines contain -DANDROID if it's required.
- # So adding -UANDROID to cancel default -DANDROID if it's not specified.
- # This is needed for some targets(e.g. symbolize)
- # TODO: Set -UANDROID considering common define
- if "ANDROID" not in defines:
- cflags.add("-UANDROID")
return cflags
def set_module_flags(module, cflags, defines):
@@ -1222,6 +1216,14 @@
'-Wno-unreachable-code-loop-increment', # needed for icui18n
'-O2',
]
+ defaults.target['host'].cflags = [
+ # -DANDROID is added by default but target.defines contain -DANDROID if
+ # it's required. So adding -UANDROID to cancel default -DANDROID if it's
+ # not specified.
+ # Note: -DANDROID is not consistently applied across the chromium code
+ # base, so it is removed unconditionally for host targets.
+ '-UANDROID',
+ ]
defaults.stl = 'none'
blueprint.add_module(defaults)