diff options
author | Tobias Thierer <tobiast@google.com> | 2018-02-07 00:16:04 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-02-07 00:16:04 +0000 |
commit | 2bbf12aa78e3583bfcbe7f468a18d0da3bce24ab (patch) | |
tree | 3fed7a21256c5c9617df3a0846e052df8b539717 /test-runner/Android.bp | |
parent | 1168c31c4a554d37e405c2f940707de0f91eab57 (diff) | |
parent | d65595a94e2e5a5dc19540fcb1ba4ff45a7d2b67 (diff) |
Merge "Pin jarjar targets to java_version 1.8."
Diffstat (limited to 'test-runner/Android.bp')
-rw-r--r-- | test-runner/Android.bp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test-runner/Android.bp b/test-runner/Android.bp index 1643a98b21b2..66b95271ee06 100644 --- a/test-runner/Android.bp +++ b/test-runner/Android.bp @@ -19,6 +19,8 @@ java_library { name: "android.test.runner", + // Needs to be consistent with the repackaged version of this make target. + java_version: "1.8", srcs: ["src/**/*.java"], no_framework_libs: true, @@ -55,4 +57,6 @@ java_library_static { static_libs: ["android.test.runner"], jarjar_rules: "jarjar-rules.txt", + // Pin java_version until jarjar is certified to support later versions. http://b/72703434 + java_version: "1.8", } |