StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add new Doclava flag support to soong"

Browse Source
This commit is contained in:
David Brazdil
2018-04-26 12:39:41 +00:00
committed by Gerrit Code Review
parent 6bcee9abff aac0c3ca2e
commit aac4b84ce5
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/androidmk.go
View File

@@ -299,6 +299,9 @@ func (ddoc *Droiddoc) AndroidMk() android.AndroidMkData {
if String(ddoc.properties.Removed_api_filename) != "" { if String(ddoc.properties.Removed_api_filename) != "" {
fmt.Fprintln(w, apiFilePrefix+"REMOVED_API_FILE := ", ddoc.removedApiFile.String()) 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) != "" { if String(ddoc.properties.Exact_api_filename) != "" {
fmt.Fprintln(w, apiFilePrefix+"EXACT_API_FILE := ", ddoc.exactApiFile.String()) fmt.Fprintln(w, apiFilePrefix+"EXACT_API_FILE := ", ddoc.exactApiFile.String())
} }

10
java/droiddoc.go
View File

@@ -149,6 +149,9 @@ type DroiddocProperties struct {
// the generated removed API filename by Doclava. // the generated removed API filename by Doclava.
Removed_api_filename *string Removed_api_filename *string
// the generated removed Dex API filename by Doclava.
Removed_dex_api_filename *string
// the generated exact API filename by Doclava. // the generated exact API filename by Doclava.
Exact_api_filename *string Exact_api_filename *string
@@ -184,6 +187,7 @@ type Droiddoc struct {
privateApiFile android.WritablePath privateApiFile android.WritablePath
privateDexApiFile android.WritablePath privateDexApiFile android.WritablePath
removedApiFile android.WritablePath removedApiFile android.WritablePath
removedDexApiFile android.WritablePath
exactApiFile android.WritablePath exactApiFile android.WritablePath
} }
@@ -567,6 +571,12 @@ func (d *Droiddoc) GenerateAndroidBuildActions(ctx android.ModuleContext) {
implicitOutputs = append(implicitOutputs, d.removedApiFile) 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) != "" { if String(d.properties.Exact_api_filename) != "" {
d.exactApiFile = android.PathForModuleOut(ctx, String(d.properties.Exact_api_filename)) d.exactApiFile = android.PathForModuleOut(ctx, String(d.properties.Exact_api_filename))
args = args + " -exactApi " + d.exactApiFile.String() args = args + " -exactApi " + d.exactApiFile.String()