Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Pin jarjar targets to java_version 1.8." am: 2bbf12aa78

Browse Source 
am: 3f48e86917

Change-Id: I16ada1b29290bebda757b8f4fae457e27c249469
This commit is contained in:
Tobias Thierer
2018-02-07 01:35:14 +00:00
committed by android-build-merger
parent ec00ab16ca 3f48e86917
commit be3a10993f
4 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proto/Android.bp
View File

@@ -6,6 +6,8 @@ java_library_static {
}, },
srcs: ["src/**/*.proto"], srcs: ["src/**/*.proto"],
no_framework_libs: true, no_framework_libs: true,
// Pin java_version until jarjar is certified to support later versions. http://b/72703434
java_version: "1.8",
target: { target: {
android: { android: {
jarjar_rules: "jarjar-rules.txt", jarjar_rules: "jarjar-rules.txt",

6
test-base/Android.bp
View File

@@ -24,6 +24,9 @@ java_library {
srcs: ["src/**/*.java"], srcs: ["src/**/*.java"],
// Needs to be consistent with the repackaged version of this make target.
java_version: "1.8",
no_framework_libs: true, no_framework_libs: true,
hostdex: true, hostdex: true,
libs: [ libs: [
@@ -55,13 +58,14 @@ java_library_static {
name: "repackaged.android.test.base", name: "repackaged.android.test.base",
static_libs: ["android.test.base"], static_libs: ["android.test.base"],
no_framework_libs: true, no_framework_libs: true,
libs: [ libs: [
"framework", "framework",
], ],
jarjar_rules: "jarjar-rules.txt", 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 // Build the android.test.base-minus-junit library

4
test-mock/Android.bp
View File

@@ -19,6 +19,8 @@
java_library { java_library {
name: "android.test.mock", name: "android.test.mock",
// Needs to be consistent with the repackaged version of this make target.
java_version: "1.8",
srcs: ["src/**/*.java"], srcs: ["src/**/*.java"],
no_framework_libs: true, no_framework_libs: true,
@@ -35,4 +37,6 @@ java_library_static {
static_libs: ["android.test.mock"], static_libs: ["android.test.mock"],
jarjar_rules: "jarjar-rules.txt", jarjar_rules: "jarjar-rules.txt",
// Pin java_version until jarjar is certified to support later versions. http://b/72703434
java_version: "1.8",
} }

4
test-runner/Android.bp
View File

@@ -19,6 +19,8 @@
java_library { java_library {
name: "android.test.runner", name: "android.test.runner",
// Needs to be consistent with the repackaged version of this make target.
java_version: "1.8",
srcs: ["src/**/*.java"], srcs: ["src/**/*.java"],
no_framework_libs: true, no_framework_libs: true,
@@ -55,4 +57,6 @@ java_library_static {
static_libs: ["android.test.runner"], static_libs: ["android.test.runner"],
jarjar_rules: "jarjar-rules.txt", jarjar_rules: "jarjar-rules.txt",
// Pin java_version until jarjar is certified to support later versions. http://b/72703434
java_version: "1.8",
} }