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

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

Merge changes from topic "soong_instrumentation_for" 

* changes:
  Fix instrumentation_for to match LOCAL_INSTRUMENTATION_FOR
  Fix incremental build issue in aapt2
  Support main_class property in java_binary modules
  Always allow duplicates with identical CRC32 and size
parents 796e9de9 4b964c00

cmd/merge_zips/merge_zips.go

+21 −10
Original line number Diff line number Diff line
@@ -173,6 +173,10 @@ func (ze zipEntry) CRC32() uint32 { 
	return ze.content.FileHeader.CRC32

}



func (ze zipEntry) Size() uint64 {

	return ze.content.FileHeader.UncompressedSize64

}



func (ze zipEntry) WriteToZip(dest string, zw *zip.Writer) error {

	return zw.CopyFrom(ze.content, dest)

}
@@ -195,6 +199,10 @@ func (be bufferEntry) CRC32() uint32 { 
	return crc32.ChecksumIEEE(be.content)

}



func (be bufferEntry) Size() uint64 {

	return uint64(len(be.content))

}



func (be bufferEntry) WriteToZip(dest string, zw *zip.Writer) error {

	w, err := zw.CreateHeader(be.fh)

	if err != nil {
@@ -215,6 +223,7 @@ type zipSource interface { 
	String() string

	IsDir() bool

	CRC32() uint32

	Size() uint64

	WriteToZip(dest string, zw *zip.Writer) error

}
@@ -369,28 +378,30 @@ func mergeZips(readers []namedZipReader, writer *zip.Writer, manifest, entrypoin 
					return fmt.Errorf("Directory/file mismatch at %v from %v and %v\n",

						dest, existingSource, source)

				}



				if ignoreDuplicates {

					continue

				}



				if emulateJar &&

					file.Name == jar.ManifestFile || file.Name == jar.ModuleInfoClass {

					// Skip manifest and module info files that are not from the first input file

					continue

				}

				if !source.IsDir() {

					if emulateJar {

						if existingSource.CRC32() != source.CRC32() {

							fmt.Fprintf(os.Stdout, "WARNING: Duplicate path %v found in %v and %v\n",

								dest, existingSource, source)



				if source.IsDir() {

					continue

				}

					} else {



				if existingSource.CRC32() == source.CRC32() && existingSource.Size() == source.Size() {

					continue

				}



				return fmt.Errorf("Duplicate path %v found in %v and %v\n",

					dest, existingSource, source)

			}

		}

	}

		}

	}



	if emulateJar {

		jarSort(orderedMappings)

cmd/merge_zips/merge_zips_test.go

+8 −0
Original line number Diff line number Diff line
@@ -87,6 +87,14 @@ func TestMergeZips(t *testing.T) { 


			ignoreDuplicates: true,

		},

		{

			name: "duplicates identical",

			in: [][]testZipEntry{

				{a},

				{a},

			},

			out: []testZipEntry{a},

		},

		{

			name: "sort",

			in: [][]testZipEntry{

java/aapt2.go

+2 −1
Original line number Diff line number Diff line
@@ -111,7 +111,8 @@ func aapt2CompileDirs(ctx android.ModuleContext, flata android.WritablePath, dir 


var aapt2LinkRule = pctx.AndroidStaticRule("aapt2Link",

	blueprint.RuleParams{

		Command: `${config.Aapt2Cmd} link -o $out $flags --java $genDir --proguard $proguardOptions ` +

		Command: `rm -rf $genDir && ` +

			`${config.Aapt2Cmd} link -o $out $flags --java $genDir --proguard $proguardOptions ` +

			`--output-text-symbols ${rTxt} $inFlags && ` +

			`${config.SoongZipCmd} -write_if_changed -jar -o $genJar -C $genDir -D $genDir &&` +

			`${config.ExtractJarPackagesCmd} -i $genJar -o $extraPackages --prefix '--extra-packages '`,

java/aar.go

+2 −0
Original line number Diff line number Diff line
@@ -250,6 +250,8 @@ func aaptLibs(ctx android.ModuleContext, sdkContext sdkContext) (transitiveStati 
		}



		switch ctx.OtherModuleDependencyTag(module) {

		case instrumentationForTag:

			// Nothing, instrumentationForTag is treated as libTag for javac but not for aapt2.

		case libTag, frameworkResTag:

			if exportPackage != nil {

				sharedLibs = append(sharedLibs, exportPackage)

java/app.go

+6 −6
Original line number Diff line number Diff line
@@ -318,12 +318,6 @@ type AndroidTest struct { 
}



func (a *AndroidTest) GenerateAndroidBuildActions(ctx android.ModuleContext) {

	if String(a.appTestProperties.Instrumentation_for) != "" {

		a.AndroidApp.extraLinkFlags = append(a.AndroidApp.extraLinkFlags,

			"--rename-instrumentation-target-package",

			String(a.appTestProperties.Instrumentation_for))

	}



	a.generateAndroidBuildActions(ctx)



	a.testConfig = tradefed.AutoGenInstrumentationTestConfig(ctx, a.testProperties.Test_config, a.testProperties.Test_config_template, a.manifestPath)
@@ -335,6 +329,12 @@ func (a *AndroidTest) DepsMutator(ctx android.BottomUpMutatorContext) { 
	android.ExtractSourceDeps(ctx, a.testProperties.Test_config_template)

	android.ExtractSourcesDeps(ctx, a.testProperties.Data)

	a.AndroidApp.DepsMutator(ctx)

	if a.appTestProperties.Instrumentation_for != nil {

		// The android_app dependency listed in instrumentation_for needs to be added to the classpath for javac,

		// but not added to the aapt2 link includes like a normal android_app or android_library dependency, so

		// use instrumentationForTag instead of libTag.

		ctx.AddVariationDependencies(nil, instrumentationForTag, String(a.appTestProperties.Instrumentation_for))

	}

}



func AndroidTestFactory() android.Module {