gn2bp: build against Android's zlib
I guess we can decide if that is what we really want to do long term.
(In which case, we would preferably have a target to link zlib
statically).
Test: builds
Change-Id: Ic5b371059874aa8cac8d24adf9f44925a89bc5a2
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 58d7cad..8a7015b 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -93,11 +93,11 @@
# Include directories that will be removed from all targets.
local_include_dirs_denylist = [
+ 'third_party/zlib/',
]
-android_include_dirs_denylist = [
+experimental_include_dirs_denylist = [
'third_party/brotli/include/',
- 'third_party/zlib/',
]
# Name of the module which settings such as compiler flags for all other
@@ -176,23 +176,23 @@
lambda m, a: None, # disable libunwind
'//net/tools/root_store_tool:root_store_tool':
lambda m, a: None,
+ '//third_party/zlib:zlib':
+ enable_zlib,
}
-android_deps = {
+experimental_android_deps = {
'//third_party/brotli:common':
enable_brotli,
'//third_party/brotli:dec':
enable_brotli,
'//third_party/modp_b64:modp_b64':
enable_modp_b64,
- '//third_party/zlib:zlib':
- enable_zlib,
}
# Uncomment the following lines to use Android deps rather than their Chromium
# equivalent:
-#builtin_deps.update(android_deps)
-#local_include_dirs_denylist.extend(android_include_dirs_denylist)
+#builtin_deps.update(experimental_android_deps)
+#local_include_dirs_denylist.extend(experimental_include_dirs_denylist)
# Name of tethering apex module
tethering_apex = "com.android.tethering"