commit 2e27e0e7ad6c536b71bbe803d30264f12ad55119
author Oleg Shaldybin <olegsh@google.com> Thu Jun 22 22:40:18 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 22 22:40:18 2023 +0000
tree 74962024e5457baaddecb38a62666721e91c510a
parent 20a3db79228cbc27632e0c871a04ca9e776336b3
parent 8503986d4a03e2cc8e362dcfe156e2a39e94328c

Merge "Pin libraries to Java version 11" am: 67a1973876 am: 2ce96774d0 am: ff110be073 am: 93329af1b0 am: 2c0ea44b21 am: 8503986d4a

Original change: https://android-review.googlesource.com/c/platform/external/perfmark/+/2634241

Change-Id: Ifa6cd7e3ca0d26ccefae3c6099ad0f0b4c028444
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

api/Android.bp

diff --git a/api/Android.bp b/api/Android.bp
index c896c96..b03e3e2 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -27,6 +27,7 @@
         "//apex_available:anyapex",
         "//apex_available:platform",
     ],
+    java_version: "11",
     sdk_version: "current",
     min_sdk_version: "30",
 }
@@ -50,6 +51,7 @@
         "//apex_available:anyapex",
         "//apex_available:platform",
     ],
+    java_version: "11",
     sdk_version: "current",
     min_sdk_version: "30",
 }
@@ -68,6 +70,7 @@
         "//apex_available:anyapex",
         "//apex_available:platform",
     ],
+    java_version: "11",
     sdk_version: "current",
     min_sdk_version: "30",
     visibility: [":__subpackages__"],
@@ -87,6 +90,7 @@
         "//apex_available:anyapex",
         "//apex_available:platform",
     ],
+    java_version: "11",
     sdk_version: "current",
     min_sdk_version: "30",
     visibility: [":__subpackages__"],
@@ -106,6 +110,7 @@
         "//apex_available:anyapex",
         "//apex_available:platform",
     ],
+    java_version: "11",
     sdk_version: "current",
     min_sdk_version: "30",
     visibility: [":__subpackages__"],
@@ -128,6 +133,7 @@
           "//apex_available:anyapex",
           "//apex_available:platform",
     ],
+    java_version: "11",
     sdk_version: "current",
     min_sdk_version: "30",
     visibility: [":__subpackages__"],