diff options
| author | 2022-04-11 23:24:06 +0000 | |
|---|---|---|
| committer | 2022-04-11 23:24:06 +0000 | |
| commit | d2aa190bdce99b0f7deda24ae13ecd3028b76d6a (patch) | |
| tree | b8c4f53f64678eadbc8ef2bd0bf451b53265cf20 /java/testing.go | |
| parent | 8c81305c80f74fcce3e8be8edbef8fb8919dd574 (diff) | |
| parent | 412436f7fed2137591745ef597bb25e3a2d90d48 (diff) | |
Merge changes I046d75db,Ie13817dc
* changes:
Don't panic if no certificates found
Move proguard test files to java package
Diffstat (limited to 'java/testing.go')
| -rw-r--r-- | java/testing.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/java/testing.go b/java/testing.go index 82aa29b61..4000334b5 100644 --- a/java/testing.go +++ b/java/testing.go @@ -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()), |