Merge changes Ied54c246,I0ea83bc8,Ibd8cb61d (0ad9dfae) · Commits · e / os / android_frameworks_base

test-base/Android.bp

+8 −13

Original line number	Diff line number	Diff line
		@@ -64,27 +64,22 @@ java_library_static {
		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.
		// Build the android.test.base-minus-junit library
		// ===============================================
		// This contains the android.test classes from android.test.base plus
		// the com.android.internal.util.Predicate[s] classes. This is only
		// intended for inclusion in the android.test.legacy static library and
		// must not be used elsewhere.
		java_library_static {
		name: "legacy-android-test",
		name: "android.test.base-minus-junit",

		srcs: [
		"src/android/*/.java",
		"src/com/*/.java",
		],

		static_libs: [
		"android.test.runner-minus-junit",
		"android.test.mock",
		],

		no_framework_libs: true,
		sdk_version: "current",
		libs: [
		"framework",
		"junit",
		],
		}

0 → 100644

+36 −0

Original line number	Diff line number	Diff line
		//
		// Copyright (C) 2018 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 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",

		static_libs: [
		"android.test.base-minus-junit",
		"android.test.runner-minus-junit",
		"android.test.mock",
		],

		no_framework_libs: true,
		libs: [
		"framework",
		"junit",
		],
		}

0 → 100644

+40 −0

Original line number	Diff line number	Diff line
		#
		# Copyright (C) 2018 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.
		#

		LOCAL_PATH:= $(call my-dir)

		# For unbundled build we'll use the prebuilt jar from prebuilts/sdk.
		ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))

		# Build the android.test.legacy library
		# =====================================
		include $(CLEAR_VARS)

		LOCAL_MODULE := android.test.legacy

		LOCAL_SDK_VERSION := current

		LOCAL_JAVA_LIBRARIES := junit
		LOCAL_STATIC_JAVA_LIBRARIES := \
		android.test.base-minus-junit \
		android.test.runner-minus-junit \

		include $(BUILD_STATIC_JAVA_LIBRARY)

		# Archive a copy of the classes.jar in SDK build.
		$(call dist-for-goals,sdk win_sdk,$(full_classes_jar):android.test.legacy.jar)

		endif # not TARGET_BUILD_APPS not TARGET_BUILD_PDK=true