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

Merge "Make prebuilt_sdk support module-lib and system-server" into rvc-dev am: e16ca7d52d

Browse Source 
Change-Id: I7d06f1c1c8cd34b1725b76c53509e7c217837487
This commit is contained in:
Anton Hansson
2020-05-04 13:02:52 +00:00
committed by Automerger Merge Worker
parent e7a69974b9 e16ca7d52d
commit 26e7ba575b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/prebuilt_apis.go
View File

@@ -59,7 +59,7 @@ func parseApiFilePath(ctx android.LoadHookContext, path string) (module string,
apiver = elements[0]
scope = elements[1]
if scope != "public" && scope != "system" && scope != "test" {
if scope != "public" && scope != "system" && scope != "test" && scope != "module-lib" && scope != "system-server" {
ctx.ModuleErrorf("invalid scope %q found in path: %q", scope, path)
return
}
@@ -100,7 +100,7 @@ func getPrebuiltFiles(mctx android.LoadHookContext, name string) []string {
mydir := mctx.ModuleDir() + "/"
var files []string
for _, apiver := range mctx.Module().(*prebuiltApis).properties.Api_dirs {
for _, scope := range []string{"public", "system", "test", "core"} {
for _, scope := range []string{"public", "system", "test", "core", "module-lib", "system-server"} {
vfiles, err := mctx.GlobWithDeps(mydir+apiver+"/"+scope+"/"+name, nil)
if err != nil {
mctx.ModuleErrorf("failed to glob %s files under %q: %s", name, mydir+apiver+"/"+scope, err)