diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index 54d8f85..c2ceaa1 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -2699,7 +2699,6 @@
         "third_party/abseil-cpp/",
         "third_party/boringssl/src/include/",
         "third_party/brotli/include/",
-        "third_party/protobuf/src/",
         "third_party/zlib/",
         "third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
     ],
@@ -3437,7 +3436,6 @@
         "net/third_party/quiche/src/quiche/common/platform/default/",
         "third_party/abseil-cpp/",
         "third_party/boringssl/src/include/",
-        "third_party/protobuf/src/",
         "third_party/zlib/",
         "third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include",
     ],
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 539817b..1e56d32 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -113,7 +113,15 @@
     module.whole_static_libs.add('perfetto_gtest_logcat_printer')
 
 
+def remove_local_protobuf_include(module):
+  # remove all third_party/protobuf includes as they conflict with libprotobuf
+  # in Android.
+  module.local_include_dirs = [it for it in module.local_include_dirs
+                               if not it.startswith('third_party/protobuf')]
+
+
 def enable_protobuf_full(module):
+  remove_local_protobuf_include(module)
   if module.type == 'cc_binary_host':
     module.static_libs.add('libprotobuf-cpp-full')
   elif module.host_supported:
@@ -124,11 +132,13 @@
 
 
 def enable_protobuf_lite(module):
+  remove_local_protobuf_include(module)
   if module.type not in ['genrule', 'filegroup']:
     module.shared_libs.add('libprotobuf-cpp-lite')
 
 
 def enable_protoc_lib(module):
+  remove_local_protobuf_include(module)
   if module.type == 'cc_binary_host':
     module.static_libs.add('libprotoc')
   else: