Don't pass static libs to r8

r8 gets the static libs in the program jar, it shouldn't also get them as library jars. Keep a separate classpath for dexing that includes libs but not static_libs. Bug: 222468116 Test: m checkbuild Test: TestD8 Test: TestR8 Change-Id: Icca3393f496cbcadcc633f3b156761e6c145f975
2022-03-17 11:12:32 -07:00
parent 3f57c6a2c8
commit 9bb9bfb349
6 changed files with 168 additions and 18 deletions
--- a/java/Android.bp
+++ b/java/Android.bp
@@ -81,6 +81,7 @@ bootstrap_go_package {
        "app_test.go",
        "bootclasspath_fragment_test.go",
        "device_host_converter_test.go",
+        "dex_test.go",
        "dexpreopt_test.go",
        "dexpreopt_bootjars_test.go",
        "droiddoc_test.go",