Merge "Add new Doclava flag support to soong" (aac4b84c) · Commits · e / os / android_build_soong

java/androidmk.go

+3 −0

Original line number	Diff line number	Diff line
		@@ -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())
		}

+10 −0

Original line number	Diff line number	Diff line
		@@ -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()