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

Merge "Java APIs used by Mainline modules."

Browse Source
This commit is contained in:
Sophie Zheng
2021-11-15 06:40:31 +00:00
committed by Gerrit Code Review
parent cb16a92ee4 0234737f30
commit 7b5fa4277f
6 changed files with 85 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
apex/androidmk.go
View File

@@ -449,23 +449,18 @@ func (a *apexBundle) androidMkForType() android.AndroidMkData {
fmt.Fprintf(w, dist)
}
if a.apisUsedByModuleFile.String() != "" {
goal := "apps_only"
distFile := a.apisUsedByModuleFile.String()
fmt.Fprintf(w, "ifneq (,$(filter $(my_register_name),$(TARGET_BUILD_APPS)))\n"+
" $(call dist-for-goals,%s,%s:ndk_apis_usedby_apex/$(notdir %s))\n"+
"endif\n",
goal, distFile, distFile)
}
if a.apisBackedByModuleFile.String() != "" {
goal := "apps_only"
distFile := a.apisBackedByModuleFile.String()
fmt.Fprintf(w, "ifneq (,$(filter $(my_register_name),$(TARGET_BUILD_APPS)))\n"+
" $(call dist-for-goals,%s,%s:ndk_apis_backedby_apex/$(notdir %s))\n"+
"endif\n",
goal, distFile, distFile)
}
distCoverageFiles(w, "ndk_apis_usedby_apex", a.nativeApisUsedByModuleFile.String())
distCoverageFiles(w, "ndk_apis_usedby_apex", a.nativeApisBackedByModuleFile.String())
distCoverageFiles(w, "java_apis_used_by_apex", a.javaApisUsedByModuleFile.String())
}
}}
}
func distCoverageFiles(w io.Writer, dir string, distfile string) {
if distfile != "" {
goal := "apps_only"
fmt.Fprintf(w, "ifneq (,$(filter $(my_register_name),$(TARGET_BUILD_APPS)))\n"+
" $(call dist-for-goals,%s,%s:%s/$(notdir %s))\n"+
"endif\n", goal, distfile, dir, distfile)
}
}