diff options
| -rw-r--r-- | test-base/Android.bp | 25 | ||||
| -rw-r--r-- | test-legacy/Android.bp | 36 | ||||
| -rw-r--r-- | test-legacy/Android.mk | 40 | ||||
| -rw-r--r-- | test-runner/Android.mk | 18 |
4 files changed, 76 insertions, 43 deletions
diff --git a/test-base/Android.bp b/test-base/Android.bp index ccf57b00a379..62fed61da276 100644 --- a/test-base/Android.bp +++ b/test-base/Android.bp @@ -83,28 +83,3 @@ java_library_static { "junit", ], } - -// 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", - ], -} diff --git a/test-legacy/Android.bp b/test-legacy/Android.bp new file mode 100644 index 000000000000..d2af8a9f1c82 --- /dev/null +++ b/test-legacy/Android.bp @@ -0,0 +1,36 @@ +// +// 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", + ], +} diff --git a/test-legacy/Android.mk b/test-legacy/Android.mk new file mode 100644 index 000000000000..b8c53266b9f8 --- /dev/null +++ b/test-legacy/Android.mk @@ -0,0 +1,40 @@ +# +# 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 diff --git a/test-runner/Android.mk b/test-runner/Android.mk index 229a6ac05bb1..706f6364ef8d 100644 --- a/test-runner/Android.mk +++ b/test-runner/Android.mk @@ -117,23 +117,5 @@ update-android-test-runner-api: $(ANDROID_TEST_RUNNER_OUTPUT_API_FILE) | $(ACP) endif # not TARGET_BUILD_APPS not TARGET_BUILD_PDK=true -# Build the android.test.legacy library -# ===================================== -include $(CLEAR_VARS) - -LOCAL_MODULE := android.test.legacy - -LOCAL_SRC_FILES := $(call all-java-files-under, src/android) - -LOCAL_SDK_VERSION := current - -LOCAL_JAVA_LIBRARIES := android.test.mock.stubs junit -LOCAL_STATIC_JAVA_LIBRARIES := android.test.base-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) - # additionally, build unit tests in a separate .apk include $(call all-makefiles-under,$(LOCAL_PATH)) |