summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-08-27 10:16:30 -0700
committerXin Li <delphij@google.com>2020-08-27 10:16:30 -0700
commitc3ac2cd7ed93e7c08003ffc5552089ae18655c23 (patch)
tree8a29ae7ece1b69fc5ad7a66f107fb60e8e978bd0
parente5b2a52dfdae6fc3ddca23b43c66620a335fb036 (diff)
parent3d5ad5c763ce4b47fdd719cffabcd095e1e1f0a1 (diff)
downloadobjenesis-c3ac2cd7ed93e7c08003ffc5552089ae18655c23.tar.gz
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903
Bug: 166295507 Merged-In: I0d83429a02c4b72bf9bee84e8817641b2fae5eeb Change-Id: I688cf9a8010c1def4043e5b1caa819dbf18da5f4
-rw-r--r--Android.bp5
1 files changed, 5 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index a37e050..b00600f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -20,6 +20,11 @@ java_library_static {
hostdex: true,
srcs: ["main/src/main/java/**/*.java"],
sdk_version: "core_current",
+
+ // Pin to Java language level 8. It is loaded by an OpenJDK 8 runtime from
+ // prebuilts/studio/jdk in frameworks/layoutlib/bridge/tests/run_tests.sh.
+ // See b/141970724.
+ java_version: "1.8",
}
// Compatibility library for old name of host target