Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 898e7de6 authored by Paul Duffin's avatar Paul Duffin
Browse files

Create test-legacy/ for android.test.legacy target 

The android.test.legacy (and legacy-android-test) target depends on
code from both test-base/ and test-runner/ and do not really belong
in either folder.

Having a separate folder will also provide a convenient place for
the artifacts needed to publish android.test.legacy to
maven.google.com.

Bug: 30188076
Test: make checkbuild
Change-Id: Ied54c24694b3167fcf9075a3157e92ec53b8f636
parent 1116291c

test-base/Android.bp

+0 −25
Original line number Diff line number Diff line
@@ -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",

    ],

}

test-legacy/Android.bp

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",

    ],

}

test-legacy/Android.mk

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

test-runner/Android.mk

+0 −18
Original line number Diff line number Diff line
@@ -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))