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 | |
| parent | 1168c31c4a554d37e405c2f940707de0f91eab57 (diff) | |
| parent | d65595a94e2e5a5dc19540fcb1ba4ff45a7d2b67 (diff) | |
Merge "Pin jarjar targets to java_version 1.8."
| -rw-r--r-- | proto/Android.bp | 2 | ||||
| -rw-r--r-- | test-base/Android.bp | 6 | ||||
| -rw-r--r-- | test-mock/Android.bp | 4 | ||||
| -rw-r--r-- | test-runner/Android.bp | 4 |
4 files changed, 15 insertions, 1 deletions
diff --git a/proto/Android.bp b/proto/Android.bp index 95f453c3e523..f3811bdd7d81 100644 --- a/proto/Android.bp +++ b/proto/Android.bp @@ -6,6 +6,8 @@ java_library_static { }, srcs: ["src/**/*.proto"], no_framework_libs: true, + // Pin java_version until jarjar is certified to support later versions. http://b/72703434 + java_version: "1.8", target: { android: { jarjar_rules: "jarjar-rules.txt", diff --git a/test-base/Android.bp b/test-base/Android.bp index 343d49fa077e..b65cda9302a7 100644 --- a/test-base/Android.bp +++ b/test-base/Android.bp @@ -24,6 +24,9 @@ java_library { srcs: ["src/**/*.java"], + // Needs to be consistent with the repackaged version of this make target. + java_version: "1.8", + no_framework_libs: true, hostdex: true, libs: [ @@ -55,13 +58,14 @@ java_library_static { name: "repackaged.android.test.base", static_libs: ["android.test.base"], - no_framework_libs: true, libs: [ "framework", ], jarjar_rules: "jarjar-rules.txt", + // Pin java_version until jarjar is certified to support later versions. http://b/72703434 + java_version: "1.8", } // Build the android.test.base-minus-junit library diff --git a/test-mock/Android.bp b/test-mock/Android.bp index b1ae40e17b9d..54e07a1673e7 100644 --- a/test-mock/Android.bp +++ b/test-mock/Android.bp @@ -19,6 +19,8 @@ java_library { name: "android.test.mock", + // Needs to be consistent with the repackaged version of this make target. + java_version: "1.8", srcs: ["src/**/*.java"], no_framework_libs: true, @@ -35,4 +37,6 @@ java_library_static { static_libs: ["android.test.mock"], jarjar_rules: "jarjar-rules.txt", + // Pin java_version until jarjar is certified to support later versions. http://b/72703434 + java_version: "1.8", } 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", } |