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

Commit abc0dab4 authored Apr 07, 2022 by Colin Cross

Move proguard test files to java package

The proguard test files are duplicated in apex and sysprop and will
be needed by app tests, move them to the java package.

Test: run all soong tests
Change-Id: Ie13817dcda8d98801d16a97ffceef1100c7d5380

parent 26ef0586

apex/apex_test.go

+36 −38

Original line number	Diff line number	Diff line
		@@ -202,8 +202,6 @@ var prepareForApexTest = android.GroupFixturePreparers(
		"myapex.apks": nil,
		"frameworks/base/api/current.txt": nil,
		"framework/aidl/a.aidl": nil,
		"build/make/core/proguard.flags": nil,
		"build/make/core/proguard_basic_keeps.flags": nil,
		"dummy.txt": nil,
		"baz": nil,
		"bar/baz": nil,

java/testing.go

+4 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,10 @@ var PrepareForTestWithJavaDefaultModulesWithoutFakeDex2oatd = android.GroupFixtu
		defaultJavaDir + "/framework/aidl": nil,
		// Needed for various deps defined in GatherRequiredDepsForTest()
		defaultJavaDir + "/a.java": nil,

		// Needed for R8 rules on apps
		"build/make/core/proguard.flags": nil,
		"build/make/core/proguard_basic_keeps.flags": nil,
		}.AddToFixture(),
		// The java default module definitions.
		android.FixtureAddTextFile(defaultJavaDir+"/Android.bp", gatherRequiredDepsForTest()),

sysprop/sysprop_test.go

+0 −3

Original line number	Diff line number	Diff line
		@@ -98,9 +98,6 @@ func test(t testing.T, bp string) android.TestResult {

		"build/soong/scripts/jar-wrapper.sh": nil,

		"build/make/core/proguard.flags": nil,
		"build/make/core/proguard_basic_keeps.flags": nil,

		"jdk8/jre/lib/jce.jar": nil,
		"jdk8/jre/lib/rt.jar": nil,
		"jdk8/lib/tools.jar": nil,