android.test.legacy is now build against SDK, thus available to apps build with SDK. In doing so, android.test.mock.stubs had to be built with SDK (because it is used by android.test.legacy). However, this wasn't trivial. The problem was that some classes in test-mock implemented abstract methods of platform classes. Even though they are marked as @hide, doclava automatically emit them to the stub file because otherwise the class in the stub file does not implement some abstract methods from its parent class, which in turn makes the stub file non-compilable. This CL solves the problem by introducing an adapter class in between the class in test-mock and the class in the framework. The adapter class implements abstract methods which are @hide and having reference to types that aren't available to SDK. The abstract methods are removed from the original class. Then doclava does not emit the abstract methods. Also by @hide'ing the adapter classes, they are not compiled when building the stub library. Bug: 30188076 Bug: 73339598 Test: m -j android.test.base Test: m -j android.test.legacy Test: m -j android.test.mock.stubs are successful and do not show link-check warning Change-Id: I8e432950e693ee3c6f0240852e62da6133d31571
63 lines
1.8 KiB
Plaintext
63 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 only intended for inclusion in the legacy-android-test static
|
|
// library and must not be used elsewhere.
|
|
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",
|
|
}
|