aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleg Shaldybin <olegsh@google.com>2023-06-22 18:57:39 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-06-22 18:57:39 +0000
commitff110be073d9ffca1396abb9e54f3ee0459ed565 (patch)
tree74962024e5457baaddecb38a62666721e91c510a
parent32db5472e0311c9432a4aaf853bbbe34bbaca7e1 (diff)
parent2ce96774d0ed8893deac545b563bd576771a734b (diff)
downloadperfmark-ff110be073d9ffca1396abb9e54f3ee0459ed565.tar.gz
Merge "Pin libraries to Java version 11" am: 67a1973876 am: 2ce96774d0
Original change: https://android-review.googlesource.com/c/platform/external/perfmark/+/2634241 Change-Id: I2c06fd9340f916293ccd9c68ce364d8d4ce6c211 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--api/Android.bp6
1 files changed, 6 insertions, 0 deletions
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 @@ java_library {
"//apex_available:anyapex",
"//apex_available:platform",
],
+ java_version: "11",
sdk_version: "current",
min_sdk_version: "30",
}
@@ -50,6 +51,7 @@ java_library {
"//apex_available:anyapex",
"//apex_available:platform",
],
+ java_version: "11",
sdk_version: "current",
min_sdk_version: "30",
}
@@ -68,6 +70,7 @@ java_library {
"//apex_available:anyapex",
"//apex_available:platform",
],
+ java_version: "11",
sdk_version: "current",
min_sdk_version: "30",
visibility: [":__subpackages__"],
@@ -87,6 +90,7 @@ java_library {
"//apex_available:anyapex",
"//apex_available:platform",
],
+ java_version: "11",
sdk_version: "current",
min_sdk_version: "30",
visibility: [":__subpackages__"],
@@ -106,6 +110,7 @@ java_library {
"//apex_available:anyapex",
"//apex_available:platform",
],
+ java_version: "11",
sdk_version: "current",
min_sdk_version: "30",
visibility: [":__subpackages__"],
@@ -128,6 +133,7 @@ java_library {
"//apex_available:anyapex",
"//apex_available:platform",
],
+ java_version: "11",
sdk_version: "current",
min_sdk_version: "30",
visibility: [":__subpackages__"],