d65595a94e
This CL pins the following make targets to java_version 1.8,
which is currently the default:
framework-protos
repackaged.android.test.base
repackaged.android.test.mock
repackaged.android.test.runner
For consistency, their dependencies,
android.test.base
android.test.mock
android.test.runner
which contain .java source files, are also pinned to 1.8.
This is so that the two steps:
a) update jarjar to support v53 class files
b) support -target 1.9 in the rest of the toolchain
can be completed in any order, in future CLs. Before this CL,
they would have needed to be completed in order a), b).
Bug: 72703434
Test: EXPERIMENTAL_USE_OPENJDK9=true USE_R8=true make checkbuild docs
(in a client where CL http://r.android.com/596874 was reverted)
Change-Id: If78067294ae7ab78997aa109b0e08be427bdf0b8
62 lines
1.8 KiB
Plaintext
62 lines
1.8 KiB
Plaintext
//
|
|
// Copyright (C) 2008 The Android Open Source Project
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
//
|
|
|
|
// Build the android.test.runner library
|
|
// =====================================
|
|
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,
|
|
libs: [
|
|
"framework",
|
|
"android.test.base",
|
|
"android.test.mock",
|
|
],
|
|
}
|
|
|
|
// Build the android.test.runner-minus-junit library
|
|
// =================================================
|
|
// This is provided solely for use by the legacy-android-test module.
|
|
java_library {
|
|
name: "android.test.runner-minus-junit",
|
|
|
|
srcs: ["src/android/**/*.java"],
|
|
|
|
no_framework_libs: true,
|
|
libs: [
|
|
"framework",
|
|
"android.test.base",
|
|
"android.test.mock",
|
|
"junit",
|
|
],
|
|
}
|
|
|
|
// Build the repackaged.android.test.runner library
|
|
// ================================================
|
|
java_library_static {
|
|
name: "repackaged.android.test.runner",
|
|
|
|
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",
|
|
}
|