Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d23969b authored by Anton Hansson's avatar Anton Hansson
Browse files

Make prebuilt_sdk support module-lib and system-server 

This makes prebuilt_sdk look for and create modules in the module-lib
and system-server subdirs too, e.g.:
    framework-wifi.api.module-lib.latest

Bug: 149293194
Test: follow-up change
Change-Id: Idbded6b633315034e669e9c5dd2bd30725d5c76b
Merged-In: Idbded6b633315034e669e9c5dd2bd30725d5c76b
parent 266a66e2

java/prebuilt_apis.go

+2 −2
Original line number Diff line number Diff line
@@ -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)