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

Commit 789419cf authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Convert frameworks/base/services/robotests to Android.bp" into stage-aosp-master

am: 6c074332

Change-Id: I5f4c04268d55e9910a5f284ea9ac450c44d7ab59
parents be62e51f 6c074332
Loading
Loading
Loading
Loading
+53 −0
Original line number Diff line number Diff line
// 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.

//##################################################################
// FrameworksServicesLib app just for Robolectric test target      #
//##################################################################

android_app {
    name: "FrameworksServicesLib",
    platform_apis: true,

    privileged: true,

    static_libs: [
        "services.core",
        "services.net",
    ],
}

//##################################################################
// FrameworksServicesLib Robolectric test target.                  #
//##################################################################
android_robolectric_test {
    name: "FrameworksServicesRoboTests",

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

    java_resource_dirs: ["config"],

    // Include the testing libraries
    libs: [
        "platform-test-annotations",
        "testng",
    ],

    instrumentation_for: "FrameworksServicesLib",
}

filegroup {
    name: "FrameworksServicesRoboShadows",
    srcs: ["src/com/android/server/testing/shadows/**/*.java"],
}

services/robotests/Android.mk

deleted100644 → 0
+0 −89
Original line number Diff line number Diff line
# 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.

###################################################################
# FrameworksServicesLib app just for Robolectric test target      #
###################################################################
LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)

LOCAL_PACKAGE_NAME := FrameworksServicesLib
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_MODULE_TAGS := optional

LOCAL_PRIVILEGED_MODULE := true

LOCAL_STATIC_JAVA_LIBRARIES := \
    services.core \
    services.net

include $(BUILD_PACKAGE)

###################################################################
# FrameworksServicesLib Robolectric test target.                  #
###################################################################
include $(CLEAR_VARS)

LOCAL_MODULE := FrameworksServicesRoboTests

LOCAL_SRC_FILES := $(call all-java-files-under, src)

LOCAL_RESOURCE_DIR := \
    $(LOCAL_PATH)/res

LOCAL_JAVA_RESOURCE_DIRS := config

# Include the testing libraries
LOCAL_JAVA_LIBRARIES := \
    platform-test-annotations \
    robolectric_android-all-stub \
    Robolectric_all-target \
    mockito-robolectric-prebuilt \
    truth-prebuilt \
    testng

LOCAL_INSTRUMENTATION_FOR := FrameworksServicesLib

LOCAL_MODULE_TAGS := optional

include $(BUILD_STATIC_JAVA_LIBRARY)

###################################################################
# FrameworksServicesLib runner target to run the previous target. #
###################################################################
include $(CLEAR_VARS)

LOCAL_MODULE := RunFrameworksServicesRoboTests

LOCAL_JAVA_LIBRARIES := \
    FrameworksServicesRoboTests \
    platform-test-annotations \
    robolectric_android-all-stub \
    Robolectric_all-target \
    mockito-robolectric-prebuilt \
    truth-prebuilt \
    testng

LOCAL_TEST_PACKAGE := FrameworksServicesLib

LOCAL_ROBOTEST_FILES := $(call find-files-in-subdirs,$(LOCAL_PATH)/src,*Test.java,.)

include external/robolectric-shadows/run_robotests.mk

###################################################################
# include subdir Android.mk files
###################################################################
include $(CLEAR_VARS)
include $(call all-makefiles-under,$(LOCAL_PATH))
+24 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  Copyright (C) 2019 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.
  -->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
          coreApp="true"
          package="com.android.server.robotests">

    <application/>

</manifest>
+53 −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.

//##################################################################
// BackupFrameworksServicesLib app just for Robolectric test target      #
//##################################################################
android_app {
    name: "BackupFrameworksServicesLib",
    platform_apis: true,

    privileged: true,

    static_libs: [
        "bmgr",
        "bu",
        "services.backup",
        "services.core",
        "services.net",
    ],
}

//##################################################################
// BackupFrameworksServicesLib Robolectric test target.                  #
//##################################################################
android_robolectric_test {
    name: "BackupFrameworksServicesRoboTests",
    srcs: [
        "src/**/*.java",
        ":FrameworksServicesRoboShadows",
    ],

    java_resource_dirs: ["config"],

    // Include the testing libraries
    libs: [
        "platform-test-annotations",
        "testng",
    ],

    instrumentation_for: "BackupFrameworksServicesLib",

}
+0 −84
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)

###################################################################
# BackupFrameworksServicesLib app just for Robolectric test target      #
###################################################################
include $(CLEAR_VARS)

LOCAL_PACKAGE_NAME := BackupFrameworksServicesLib
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_MODULE_TAGS := optional

LOCAL_PRIVILEGED_MODULE := true

LOCAL_STATIC_JAVA_LIBRARIES := \
    bmgr \
    bu \
    services.backup \
    services.core \
    services.net

include $(BUILD_PACKAGE)

###################################################################
# BackupFrameworksServicesLib Robolectric test target.                  #
###################################################################
include $(CLEAR_VARS)

LOCAL_MODULE := BackupFrameworksServicesRoboTests

LOCAL_SRC_FILES := $(call all-java-files-under, src) \
    $(call all-java-files-under, ../src/com/android/server/testing/shadows)

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res

LOCAL_JAVA_RESOURCE_DIRS := config

# Include the testing libraries
LOCAL_JAVA_LIBRARIES := \
    platform-test-annotations \
    robolectric_android-all-stub \
    Robolectric_all-target \
    mockito-robolectric-prebuilt \
    truth-prebuilt \
    testng

LOCAL_INSTRUMENTATION_FOR := BackupFrameworksServicesLib

LOCAL_MODULE_TAGS := optional

include $(BUILD_STATIC_JAVA_LIBRARY)

###################################################################
# BackupFrameworksServicesLib runner target to run the previous target. #
###################################################################
include $(CLEAR_VARS)

LOCAL_MODULE := RunBackupFrameworksServicesRoboTests

LOCAL_JAVA_LIBRARIES := \
    BackupFrameworksServicesRoboTests \
    platform-test-annotations \
    robolectric_android-all-stub \
    Robolectric_all-target \
    mockito-robolectric-prebuilt \
    truth-prebuilt \
    testng

LOCAL_TEST_PACKAGE := BackupFrameworksServicesLib

include external/robolectric-shadows/run_robotests.mk
Loading