commit aac0c3ca2ec90acc21189597ed73f316a1d91ed5
author David Brazdil <dbrazdil@google.com> Tue Apr 24 16:23:29 2018 +0100
committer David Brazdil <dbrazdil@google.com> Wed Apr 25 10:12:40 2018 +0000
tree 946d65ec5e213dd76dde7dc2c24928c82ef47d79
parent 95ba30aa5663f91251fecb83ff2d828763e2ce36

Add new Doclava flag support to soong

CL I8fe27e8c03334f9c90204db1e69447de65a06a38 adds new "-removedDexApi"
flag to Doclava. This patch adds support for that flag into Soong.
"droiddoc" targets can generate the new API file with property
"removed_dex_api_filename".

Bug: 78182899
Test: make
Change-Id: I04b8f615aa4655167b824d40c3fafa2648beec01

java/androidmk.go

diff --git a/java/androidmk.go b/java/androidmk.go
index 8bde716..fc93cfb 100644
--- a/java/androidmk.go
+++ b/java/androidmk.go
@@ -299,6 +299,9 @@
 				if String(ddoc.properties.Removed_api_filename) != "" {
 					fmt.Fprintln(w, apiFilePrefix+"REMOVED_API_FILE := ", ddoc.removedApiFile.String())
 				}
+				if String(ddoc.properties.Removed_dex_api_filename) != "" {
+					fmt.Fprintln(w, apiFilePrefix+"REMOVED_DEX_API_FILE := ", ddoc.removedDexApiFile.String())
+				}
 				if String(ddoc.properties.Exact_api_filename) != "" {
 					fmt.Fprintln(w, apiFilePrefix+"EXACT_API_FILE := ", ddoc.exactApiFile.String())
 				}

java/droiddoc.go

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()