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

Commit a9dbd27a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "aconfig_framework_circle" into main 

* changes:
  Allow generated java libs to specify libraries.
  Allow access to the generated srcjars for GeneratedJavaLibrary
parents 497a6df3 9e3716ca

java/base.go

+2 −0
Original line number Diff line number Diff line
@@ -622,6 +622,8 @@ func (j *Module) OutputFiles(tag string) (android.Paths, error) { 
			return android.Paths{j.dexer.proguardDictionary.Path()}, nil

		}

		return nil, fmt.Errorf("%q was requested, but no output file was found.", tag)

	case ".generated_srcjars":

		return j.properties.Generated_srcjars, nil

	default:

		return nil, fmt.Errorf("unsupported module reference tag %q", tag)

	}

java/generated_java_library.go

+0 −5
Original line number Diff line number Diff line
@@ -78,11 +78,6 @@ func (module *GeneratedJavaLibraryModule) GenerateAndroidBuildActions(ctx androi 
	checkPropertyEmpty(ctx, module, "exclude_srcs", module.Library.properties.Exclude_srcs)

	checkPropertyEmpty(ctx, module, "java_resource_dirs", module.Library.properties.Java_resource_dirs)

	checkPropertyEmpty(ctx, module, "exclude_java_resource_dirs", module.Library.properties.Exclude_java_resource_dirs)

	// No additional libraries. The generator should add anything necessary automatically

	// by returning something from ____ (TODO: Additional libraries aren't needed now, so

	// these are just blocked).

	checkPropertyEmpty(ctx, module, "libs", module.Library.properties.Libs)

	checkPropertyEmpty(ctx, module, "static_libs", module.Library.properties.Static_libs)

	// Restrict these for no good reason other than to limit the surface area. If there's a

	// good use case put them back.

	checkPropertyEmpty(ctx, module, "plugins", module.Library.properties.Plugins)