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

Merge "Rename stubsjar to stubsSrcjar for droiddoc"

Browse Source 
am: e9b02776f4

Change-Id: I7693fb2e8fa1076b905386f20d2264c90e9570d1
This commit is contained in:
Nan Zhang
2018-03-09 10:04:30 +00:00
committed by android-build-merger
parent 870e5d96cd e9b02776f4
commit 9428f61b31
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
java/androidmk.go
View File

@@ -218,15 +218,15 @@ func (app *AndroidApp) AndroidMk() android.AndroidMkData {
func (jd *Javadoc) AndroidMk() android.AndroidMkData { func (jd *Javadoc) AndroidMk() android.AndroidMkData {
return android.AndroidMkData{ return android.AndroidMkData{
Class: "JAVA_LIBRARIES", Class: "JAVA_LIBRARIES",
OutputFile: android.OptionalPathForPath(jd.stubsJar), OutputFile: android.OptionalPathForPath(jd.stubsSrcJar),
Include: "$(BUILD_SYSTEM)/soong_java_prebuilt.mk", Include: "$(BUILD_SYSTEM)/soong_java_prebuilt.mk",
Extra: []android.AndroidMkExtraFunc{ Extra: []android.AndroidMkExtraFunc{
func(w io.Writer, outputFile android.Path) { func(w io.Writer, outputFile android.Path) {
if jd.properties.Installable == nil || *jd.properties.Installable == true { if jd.properties.Installable == nil || *jd.properties.Installable == true {
fmt.Fprintln(w, "LOCAL_DROIDDOC_DOC_ZIP := ", jd.docZip.String()) fmt.Fprintln(w, "LOCAL_DROIDDOC_DOC_ZIP := ", jd.docZip.String())
} }
if jd.stubsJar != nil { if jd.stubsSrcJar != nil {
fmt.Fprintln(w, "LOCAL_DROIDDOC_STUBS_JAR := ", jd.stubsJar.String()) fmt.Fprintln(w, "LOCAL_DROIDDOC_STUBS_SRCJAR := ", jd.stubsSrcJar.String())
} }
}, },
}, },
@@ -236,15 +236,15 @@ func (jd *Javadoc) AndroidMk() android.AndroidMkData {
func (ddoc *Droiddoc) AndroidMk() android.AndroidMkData { func (ddoc *Droiddoc) AndroidMk() android.AndroidMkData {
return android.AndroidMkData{ return android.AndroidMkData{
Class: "JAVA_LIBRARIES", Class: "JAVA_LIBRARIES",
OutputFile: android.OptionalPathForPath(ddoc.stubsJar), OutputFile: android.OptionalPathForPath(ddoc.stubsSrcJar),
Include: "$(BUILD_SYSTEM)/soong_java_prebuilt.mk", Include: "$(BUILD_SYSTEM)/soong_java_prebuilt.mk",
Extra: []android.AndroidMkExtraFunc{ Extra: []android.AndroidMkExtraFunc{
func(w io.Writer, outputFile android.Path) { func(w io.Writer, outputFile android.Path) {
if ddoc.Javadoc.properties.Installable == nil || *ddoc.Javadoc.properties.Installable == true { if ddoc.Javadoc.properties.Installable == nil || *ddoc.Javadoc.properties.Installable == true {
fmt.Fprintln(w, "LOCAL_DROIDDOC_DOC_ZIP := ", ddoc.Javadoc.docZip.String()) fmt.Fprintln(w, "LOCAL_DROIDDOC_DOC_ZIP := ", ddoc.Javadoc.docZip.String())
} }
if ddoc.Javadoc.stubsJar != nil { if ddoc.Javadoc.stubsSrcJar != nil {
fmt.Fprintln(w, "LOCAL_DROIDDOC_STUBS_JAR := ", ddoc.Javadoc.stubsJar.String()) fmt.Fprintln(w, "LOCAL_DROIDDOC_STUBS_SRCJAR := ", ddoc.Javadoc.stubsSrcJar.String())
} }
}, },
}, },

8
java/droiddoc.go
View File

@@ -130,7 +130,7 @@ type Javadoc struct {
sourcepaths android.Paths sourcepaths android.Paths
docZip android.WritablePath docZip android.WritablePath
stubsJar android.WritablePath stubsSrcJar android.WritablePath
} }
type Droiddoc struct { type Droiddoc struct {
@@ -255,7 +255,7 @@ func (j *Javadoc) collectDeps(ctx android.ModuleContext) deps {
j.srcFiles = srcFiles.FilterOutByExt(".srcjar") j.srcFiles = srcFiles.FilterOutByExt(".srcjar")
j.docZip = android.PathForModuleOut(ctx, ctx.ModuleName()+"-"+"docs.zip") j.docZip = android.PathForModuleOut(ctx, ctx.ModuleName()+"-"+"docs.zip")
j.stubsJar = android.PathForModuleOut(ctx, ctx.ModuleName()+"-"+"stubs.srcjar") j.stubsSrcJar = android.PathForModuleOut(ctx, ctx.ModuleName()+"-"+"stubs.srcjar")
if j.properties.Local_sourcepaths == nil { if j.properties.Local_sourcepaths == nil {
j.properties.Local_sourcepaths = append(j.properties.Local_sourcepaths, ".") j.properties.Local_sourcepaths = append(j.properties.Local_sourcepaths, ".")
@@ -304,7 +304,7 @@ func (j *Javadoc) GenerateAndroidBuildActions(ctx android.ModuleContext) {
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: javadoc, Rule: javadoc,
Description: "Javadoc", Description: "Javadoc",
Output: j.stubsJar, Output: j.stubsSrcJar,
ImplicitOutput: j.docZip, ImplicitOutput: j.docZip,
Inputs: j.srcFiles, Inputs: j.srcFiles,
Implicits: implicits, Implicits: implicits,
@@ -453,7 +453,7 @@ func (d *Droiddoc) GenerateAndroidBuildActions(ctx android.ModuleContext) {
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: javadoc, Rule: javadoc,
Description: "Droiddoc", Description: "Droiddoc",
Output: d.Javadoc.stubsJar, Output: d.Javadoc.stubsSrcJar,
Inputs: d.Javadoc.srcFiles, Inputs: d.Javadoc.srcFiles,
Implicits: implicits, Implicits: implicits,
ImplicitOutputs: implicitOutputs, ImplicitOutputs: implicitOutputs,