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
This commit is contained in:
parent
26ef058655
commit
abc0dab477
3 changed files with 40 additions and 41 deletions
|
@ -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,
|
||||
|
|
|
@ -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()),
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue