diff --git a/java/droiddoc.go b/java/droiddoc.go
index 4dd5fbb..07042a1 100644
--- a/java/droiddoc.go
+++ b/java/droiddoc.go
@@ -149,6 +149,9 @@
 	// the generated removed API filename by Doclava.
 	Removed_api_filename *string
 
+	// the generated removed Dex API filename by Doclava.
+	Removed_dex_api_filename *string
+
 	// the generated exact API filename by Doclava.
 	Exact_api_filename *string
 
@@ -184,6 +187,7 @@
 	privateApiFile    android.WritablePath
 	privateDexApiFile android.WritablePath
 	removedApiFile    android.WritablePath
+	removedDexApiFile android.WritablePath
 	exactApiFile      android.WritablePath
 }
 
@@ -567,6 +571,12 @@
 		implicitOutputs = append(implicitOutputs, d.removedApiFile)
 	}
 
+	if String(d.properties.Removed_dex_api_filename) != "" {
+		d.removedDexApiFile = android.PathForModuleOut(ctx, String(d.properties.Removed_dex_api_filename))
+		args = args + " -removedDexApi " + d.removedDexApiFile.String()
+		implicitOutputs = append(implicitOutputs, d.removedDexApiFile)
+	}
+
 	if String(d.properties.Exact_api_filename) != "" {
 		d.exactApiFile = android.PathForModuleOut(ctx, String(d.properties.Exact_api_filename))
 		args = args + " -exactApi " + d.exactApiFile.String()
