diff options
author | 2022-12-17 03:14:10 +0000 | |
---|---|---|
committer | 2022-12-17 03:15:22 +0000 | |
commit | 6f7e288fb5ea2fb01d9093fd57081a82c09a6618 (patch) | |
tree | 6f57fcc1b175a5d68259eb20218552b98946bef7 /java/dex_test.go | |
parent | 9c54f032b9dbef63b9ef235c2219a4e9124f8891 (diff) |
Revert "Include proguard flag files from transitive java_library deps"
This reverts commit 9c54f032b9dbef63b9ef235c2219a4e9124f8891.
Reason for revert: b/262940536
Bug: b/262940536
Change-Id: I8140eacc7ca8716f799561412cb5cef29df35d29
Diffstat (limited to 'java/dex_test.go')
-rw-r--r-- | java/dex_test.go | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/java/dex_test.go b/java/dex_test.go index fc6cd0f3f..66178732a 100644 --- a/java/dex_test.go +++ b/java/dex_test.go @@ -155,57 +155,3 @@ func TestD8(t *testing.T) { android.AssertStringDoesNotContain(t, "expected no static_lib header jar in foo javac classpath", fooD8.Args["d8Flags"], staticLibHeader.String()) } - -func TestProguardFlagsInheritance(t *testing.T) { - result := PrepareForTestWithJavaDefaultModulesWithoutFakeDex2oatd.RunTestWithBp(t, ` - android_app { - name: "app", - static_libs: [ - "primary_android_lib", - "primary_lib", - ], - platform_apis: true, - } - - java_library { - name: "primary_lib", - optimize: { - proguard_flags_files: ["primary.flags"], - }, - } - - android_library { - name: "primary_android_lib", - static_libs: ["secondary_lib"], - optimize: { - proguard_flags_files: ["primary_android.flags"], - }, - } - - java_library { - name: "secondary_lib", - static_libs: ["tertiary_lib"], - optimize: { - proguard_flags_files: ["secondary.flags"], - }, - } - - java_library { - name: "tertiary_lib", - optimize: { - proguard_flags_files: ["tertiary.flags"], - }, - } - `) - - app := result.ModuleForTests("app", "android_common") - appR8 := app.Rule("r8") - android.AssertStringDoesContain(t, "expected primary_lib's proguard flags from direct dep", - appR8.Args["r8Flags"], "primary.flags") - android.AssertStringDoesContain(t, "expected primary_android_lib's proguard flags from direct dep", - appR8.Args["r8Flags"], "primary_android.flags") - android.AssertStringDoesContain(t, "expected secondary_lib's proguard flags from inherited dep", - appR8.Args["r8Flags"], "secondary.flags") - android.AssertStringDoesContain(t, "expected tertiary_lib's proguard flags from inherited dep", - appR8.Args["r8Flags"], "tertiary.flags") -} |