commit cac55fff4ee15b73150e4aa4a1e490c606f5f5e8
author Orion Hodson <oth@google.com> Fri Sep 09 13:58:18 2022 +0100
committer Orion Hodson <oth@google.com> Fri Sep 09 13:58:18 2022 +0100
tree a0c35d2844136ba1bd7835d80dbcd102e849a404
parent c5ad48a9317ce7d95ee8f33f1753b57012c71cae

Enable --android-platform-build for libcore projects

This is to turn-off d8 desugaring in libcore itself.

Bug: 232073181
Test: atest CtsLibcoreTestOjCases CtsLibcoreTestCases
Change-Id: I534eb6d78da8900b68152073ca9e4a4b91508ad9

JavaLibrary.bp

diff --git a/JavaLibrary.bp b/JavaLibrary.bp
index d0558d1..bed3a0a 100644
--- a/JavaLibrary.bp
+++ b/JavaLibrary.bp
@@ -153,7 +153,10 @@
         //"-Xlint:all",
         //"-Xlint:-serial,-deprecation,-unchecked",
     ],
-    dxflags: ["--core-library"],
+    dxflags: [
+        "--android-platform-build",
+        "--core-library",
+    ],
     errorprone: {
         javacflags: [
             "-Xep:MissingOverride:OFF", // Ignore missing @Override.