diff options
| author | Xin Li <delphij@google.com> | 2020-08-27 10:16:26 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2020-08-27 10:16:26 -0700 |
| commit | 85e5a7f644ea451791e3dc4cc122e7fbfb75ed81 (patch) | |
| tree | c73a16dc610c99520a93c2b33b8a4a3d7e64a00f | |
| parent | c3f6da7e6510ccb68c55332ba9deee09e714c506 (diff) | |
| parent | 346bc2c2e03cbdffd3ed9dda2dcbc1966c7c34bb (diff) | |
| download | hamcrest-85e5a7f644ea451791e3dc4cc122e7fbfb75ed81.tar.gz | |
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903
Bug: 166295507
Merged-In: I155b87208e6fc16bced6f6f295b84f79c5287147
Change-Id: I3ba28680e41e79b77c1b2bcac8b97a88afbf12cd
| -rw-r--r-- | hamcrest-core/Android.bp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/hamcrest-core/Android.bp b/hamcrest-core/Android.bp index da980d8..6cb02ce 100644 --- a/hamcrest-core/Android.bp +++ b/hamcrest-core/Android.bp @@ -20,4 +20,9 @@ java_library_static { hostdex: true, srcs: ["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", } |