tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Change the dist file path for sdk library"

Browse source
This commit is contained in:
Treehugger Robot 2018-09-18 02:29:44 +00:00 committed by Gerrit Code Review
commit 6b3cc607f3
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/module.go
View file

@ -602,6 +602,10 @@ func (p *ModuleBase) InstallInRecovery() bool {
return Bool(p.commonProperties.Recovery) return Bool(p.commonProperties.Recovery)
} }
func (a *ModuleBase) Owner() string {
return String(a.commonProperties.Owner)
}
func (a *ModuleBase) generateModuleTarget(ctx ModuleContext) { func (a *ModuleBase) generateModuleTarget(ctx ModuleContext) {
allInstalledFiles := Paths{} allInstalledFiles := Paths{}
allCheckbuildFiles := Paths{} allCheckbuildFiles := Paths{}

19
java/sdk_library.go
View file

@ -217,38 +217,45 @@ func (module *sdkLibrary) AndroidMk() android.AndroidMkData {
fmt.Fprintln(w, "LOCAL_MODULE :=", name) fmt.Fprintln(w, "LOCAL_MODULE :=", name)
fmt.Fprintln(w, "LOCAL_REQUIRED_MODULES := "+module.implName()) fmt.Fprintln(w, "LOCAL_REQUIRED_MODULES := "+module.implName())
fmt.Fprintln(w, "include $(BUILD_PHONY_PACKAGE)") fmt.Fprintln(w, "include $(BUILD_PHONY_PACKAGE)")
owner := module.ModuleBase.Owner()
if owner == "" {
owner = "android"
}
// Create dist rules to install the stubs libs to the dist dir // Create dist rules to install the stubs libs to the dist dir
if len(module.publicApiStubsPath) == 1 { if len(module.publicApiStubsPath) == 1 {
fmt.Fprintln(w, "$(call dist-for-goals,sdk win_sdk,"+ fmt.Fprintln(w, "$(call dist-for-goals,sdk win_sdk,"+
module.publicApiStubsPath.Strings()[0]+ module.publicApiStubsPath.Strings()[0]+
":"+path.Join("apistubs", "public", module.BaseModuleName()+".jar")+")") ":"+path.Join("apistubs", owner, "public",
module.BaseModuleName()+".jar")+")")
} }
if len(module.systemApiStubsPath) == 1 { if len(module.systemApiStubsPath) == 1 {
fmt.Fprintln(w, "$(call dist-for-goals,sdk win_sdk,"+ fmt.Fprintln(w, "$(call dist-for-goals,sdk win_sdk,"+
module.systemApiStubsPath.Strings()[0]+ module.systemApiStubsPath.Strings()[0]+
":"+path.Join("apistubs", "system", module.BaseModuleName()+".jar")+")") ":"+path.Join("apistubs", owner, "system",
module.BaseModuleName()+".jar")+")")
} }
if len(module.testApiStubsPath) == 1 { if len(module.testApiStubsPath) == 1 {
fmt.Fprintln(w, "$(call dist-for-goals,sdk win_sdk,"+ fmt.Fprintln(w, "$(call dist-for-goals,sdk win_sdk,"+
module.testApiStubsPath.Strings()[0]+ module.testApiStubsPath.Strings()[0]+
":"+path.Join("apistubs", "test", module.BaseModuleName()+".jar")+")") ":"+path.Join("apistubs", owner, "test",
module.BaseModuleName()+".jar")+")")
} }
if module.publicApiFilePath != nil { if module.publicApiFilePath != nil {
fmt.Fprintln(w, "$(call dist-for-goals,sdk win_sdk,"+ fmt.Fprintln(w, "$(call dist-for-goals,sdk win_sdk,"+
module.publicApiFilePath.String()+ module.publicApiFilePath.String()+
":"+path.Join("apistubs", "public", "api", ":"+path.Join("apistubs", owner, "public", "api",
module.BaseModuleName()+".txt")+")") module.BaseModuleName()+".txt")+")")
} }
if module.systemApiFilePath != nil { if module.systemApiFilePath != nil {
fmt.Fprintln(w, "$(call dist-for-goals,sdk win_sdk,"+ fmt.Fprintln(w, "$(call dist-for-goals,sdk win_sdk,"+
module.systemApiFilePath.String()+ module.systemApiFilePath.String()+
":"+path.Join("apistubs", "system", "api", ":"+path.Join("apistubs", owner, "system", "api",
module.BaseModuleName()+".txt")+")") module.BaseModuleName()+".txt")+")")
} }
if module.testApiFilePath != nil { if module.testApiFilePath != nil {
fmt.Fprintln(w, "$(call dist-for-goals,sdk win_sdk,"+ fmt.Fprintln(w, "$(call dist-for-goals,sdk win_sdk,"+
module.testApiFilePath.String()+ module.testApiFilePath.String()+
":"+path.Join("apistubs", "test", "api", ":"+path.Join("apistubs", owner, "test", "api",
module.BaseModuleName()+".txt")+")") module.BaseModuleName()+".txt")+")")
} }
}, },