diff options
| author | David Brazdil <dbrazdil@google.com> | 2018-04-26 12:39:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-04-26 12:39:41 +0000 |
| commit | aac4b84ce5d72c37cd892f1713fcfceab5ee96bb (patch) | |
| tree | 42e92922e64740c3522f7734aa0297117653979b | |
| parent | 6bcee9abff86b01f4db892398ede1158b74a7f28 (diff) | |
| parent | aac0c3ca2ec90acc21189597ed73f316a1d91ed5 (diff) | |
| download | build_soong-aac4b84ce5d72c37cd892f1713fcfceab5ee96bb.tar.gz build_soong-aac4b84ce5d72c37cd892f1713fcfceab5ee96bb.tar.bz2 build_soong-aac4b84ce5d72c37cd892f1713fcfceab5ee96bb.zip | |
Merge "Add new Doclava flag support to soong"
| -rw-r--r-- | java/androidmk.go | 3 | ||||
| -rw-r--r-- | java/droiddoc.go | 10 |
2 files changed, 13 insertions, 0 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index 8bde716b..fc93cfb5 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -299,6 +299,9 @@ func (ddoc *Droiddoc) AndroidMk() android.AndroidMkData { 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()) } diff --git a/java/droiddoc.go b/java/droiddoc.go index 4dd5fbb0..07042a11 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -149,6 +149,9 @@ type DroiddocProperties struct { // 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 @@ type Droiddoc struct { privateApiFile android.WritablePath privateDexApiFile android.WritablePath removedApiFile android.WritablePath + removedDexApiFile android.WritablePath exactApiFile android.WritablePath } @@ -567,6 +571,12 @@ func (d *Droiddoc) GenerateAndroidBuildActions(ctx android.ModuleContext) { 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() |