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

Commit 1c8e5e81 authored by Bill Peckham's avatar Bill Peckham Committed by Gerrit Code Review
Browse files

Merge changes from topic "prebuilt-hiddenapi" 

* changes:
  Supply LOCAL_SOONG_DEX_JAR for java_import with compile_dex.
  Enable an apex to include a java_import.
  Enable prebuilt hiddenapi CSV files.
parents 965561ce fb04df4d

android/config.go

+4 −0
Original line number Diff line number Diff line
@@ -1026,6 +1026,10 @@ func (c *config) HasMultilibConflict(arch ArchType) bool { 
	return c.multilibConflicts[arch]

}



func (c *config) PrebuiltHiddenApiDir(ctx PathContext) string {

	return String(c.productVariables.PrebuiltHiddenApiDir)

}



func (c *deviceConfig) Arches() []Arch {

	var arches []Arch

	for _, target := range c.config.Targets[Android] {

android/variable.go

+2 −0
Original line number Diff line number Diff line
@@ -367,6 +367,8 @@ type productVariables struct { 
	BoardKernelModuleInterfaceVersions []string `json:",omitempty"`



	BoardMoveRecoveryResourcesToVendorBoot *bool `json:",omitempty"`



	PrebuiltHiddenApiDir *string `json:",omitempty"`

}



func boolPtr(v bool) *bool {

apex/apex.go

+2 −1
Original line number Diff line number Diff line
@@ -1428,6 +1428,7 @@ type javaModule interface { 
}



var _ javaModule = (*java.Library)(nil)

var _ javaModule = (*java.Import)(nil)

var _ javaModule = (*java.SdkLibrary)(nil)

var _ javaModule = (*java.DexImport)(nil)

var _ javaModule = (*java.SdkLibraryImport)(nil)
@@ -1629,7 +1630,7 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
				}

			case javaLibTag:

				switch child.(type) {

				case *java.Library, *java.SdkLibrary, *java.DexImport, *java.SdkLibraryImport:

				case *java.Library, *java.SdkLibrary, *java.DexImport, *java.SdkLibraryImport, *java.Import:

					af := apexFileForJavaModule(ctx, child.(javaModule))

					if !af.ok() {

						ctx.PropertyErrorf("java_libs", "%q is not configured to be compiled into dex", depName)

apex/apex_test.go

+28 −0
Original line number Diff line number Diff line
@@ -4515,6 +4515,34 @@ func TestErrorsIfDepsAreNotEnabled(t *testing.T) { 
	`)

}



func TestApexWithJavaImport(t *testing.T) {

	ctx, _ := testApex(t, `

		apex {

			name: "myapex",

			key: "myapex.key",

			java_libs: ["myjavaimport"],

		}



		apex_key {

			name: "myapex.key",

			public_key: "testkey.avbpubkey",

			private_key: "testkey.pem",

		}



		java_import {

			name: "myjavaimport",

			apex_available: ["myapex"],

			jars: ["my.jar"],

			compile_dex: true,

		}

	`)



	module := ctx.ModuleForTests("myapex", "android_common_myapex_image")

	apexRule := module.Rule("apexRule")

	copyCmds := apexRule.Args["copy_commands"]

	ensureContains(t, copyCmds, "image.apex/javalib/myjavaimport.jar")

}



func TestApexWithApps(t *testing.T) {

	ctx, _ := testApex(t, `

		apex {

java/androidmk.go

+3 −0
Original line number Diff line number Diff line
@@ -196,6 +196,9 @@ func (prebuilt *Import) AndroidMkEntries() []android.AndroidMkEntries { 
		ExtraEntries: []android.AndroidMkExtraEntriesFunc{

			func(entries *android.AndroidMkEntries) {

				entries.SetBool("LOCAL_UNINSTALLABLE_MODULE", !Bool(prebuilt.properties.Installable))

				if prebuilt.dexJarFile != nil {

					entries.SetPath("LOCAL_SOONG_DEX_JAR", prebuilt.dexJarFile)

				}

				entries.SetPath("LOCAL_SOONG_HEADER_JAR", prebuilt.combinedClasspathFile)

				entries.SetPath("LOCAL_SOONG_CLASSES_JAR", prebuilt.combinedClasspathFile)

				entries.SetString("LOCAL_SDK_VERSION", prebuilt.makeSdkVersion())