a88eb29f9e
A mistake during the conversion of the legacy-android-test target from Android.mk to Android.bp caused some junit classes to be accidentally included in the legacy-android-test target. That caused some warnings about duplicate classes to be output during the build. The junit classes are being included as part of the static library android.test.runner. This fixes that by adding a new android.test.runner-minus-junit which excludes the junit classes and then using that instead. Test: make checkbuild Change-Id: Icd00b38c64d3416a55c1055f9716ddb78ec278f8
90 lines
2.4 KiB
Plaintext
90 lines
2.4 KiB
Plaintext
//
|
|
// Copyright (C) 2016 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.base library
|
|
// ===================================
|
|
// This contains the junit.framework and android.test classes that were in
|
|
// Android API level 25 excluding those from android.test.runner.
|
|
// Also contains the com.android.internal.util.Predicate[s] classes.
|
|
java_library {
|
|
name: "android.test.base",
|
|
|
|
srcs: ["src/**/*.java"],
|
|
|
|
no_framework_libs: true,
|
|
hostdex: true,
|
|
libs: [
|
|
"framework",
|
|
],
|
|
|
|
}
|
|
|
|
// Build the legacy-test library
|
|
// =============================
|
|
// This contains the junit.framework and android.test classes that were in
|
|
// Android API level 25 excluding those from android.test.runner.
|
|
// Also contains the com.android.internal.util.Predicate[s] classes.
|
|
java_library {
|
|
name: "legacy-test",
|
|
static_libs: ["android.test.base"],
|
|
|
|
no_framework_libs: true,
|
|
libs: [
|
|
"framework",
|
|
],
|
|
}
|
|
|
|
// Build the repackaged.android.test.base library
|
|
// ==============================================
|
|
// This contains repackaged versions of the classes from legacy-test.
|
|
java_library_static {
|
|
name: "repackaged.android.test.base",
|
|
|
|
static_libs: ["android.test.base"],
|
|
|
|
no_framework_libs: true,
|
|
libs: [
|
|
"framework",
|
|
],
|
|
|
|
jarjar_rules: "jarjar-rules.txt",
|
|
}
|
|
|
|
// Build the legacy-android-test library
|
|
// =====================================
|
|
// This contains the android.test classes that were in Android API level 25,
|
|
// including those from android.test.runner.
|
|
// Also contains the com.android.internal.util.Predicate[s] classes.
|
|
java_library_static {
|
|
name: "legacy-android-test",
|
|
|
|
srcs: [
|
|
"src/android/**/*.java",
|
|
"src/com/**/*.java",
|
|
],
|
|
|
|
static_libs: [
|
|
"android.test.runner-minus-junit",
|
|
"android.test.mock",
|
|
],
|
|
|
|
no_framework_libs: true,
|
|
libs: [
|
|
"framework",
|
|
"junit",
|
|
],
|
|
}
|