From d53d2ca07d99107caf80812a2dda5b355b0815e8 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 12 May 2021 13:43:51 +0100
Subject: [PATCH] Fix search links in generated Javadoc

#minor-release

PiperOrigin-RevId: 373351014
---
 javadoc_combined.gradle | 1 +
 javadoc_library.gradle  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/javadoc_combined.gradle b/javadoc_combined.gradle
index 1030d3e16a..c40ffc8815 100644
--- a/javadoc_combined.gradle
+++ b/javadoc_combined.gradle
@@ -34,6 +34,7 @@ class CombinedJavadocPlugin implements Plugin<Project> {
                   "https://guava.dev/releases/$project.ext.guavaVersion/api/docs"
             encoding = "UTF-8"
           }
+          options.addBooleanOption "-no-module-directories", true
           exclude "**/BuildConfig.java"
           exclude "**/R.java"
           doFirst {
diff --git a/javadoc_library.gradle b/javadoc_library.gradle
index 20be99ee12..291e0c896d 100644
--- a/javadoc_library.gradle
+++ b/javadoc_library.gradle
@@ -31,6 +31,7 @@ android.libraryVariants.all { variant ->
                   "https://guava.dev/releases/$project.ext.guavaVersion/api/docs"
             encoding = "UTF-8"
         }
+        options.addBooleanOption "-no-module-directories", true
         exclude "**/BuildConfig.java"
         exclude "**/R.java"
         doFirst {