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

Commit 2f2f93f5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Convert CameraTooTest to Android.bp" into main am: d707835c am: abda7190 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2902307



Change-Id: I64936ba676b040f99a99b2dd7ccaa6a74e84a3c4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 90978a84 abda7190

tests/Camera2Tests/CameraToo/tests/Android.bp

0 → 100644
+34 −0
Original line number Diff line number Diff line 
// Copyright (C) 2014 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.



package {

    // See: http://go/android-license-faq

    default_applicable_licenses: [

        "frameworks_base_license",

    ],

}



android_test {

    name: "CameraTooTests",

    instrumentation_for: "CameraToo",

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

    sdk_version: "current",

    static_libs: [

        "androidx.test.rules",

        "mockito-target-minus-junit4",

    ],

    data: [

        ":CameraToo",

    ],

}

tests/Camera2Tests/CameraToo/tests/Android.mk

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
# Copyright (C) 2014 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)

include $(CLEAR_VARS)



LOCAL_MODULE_TAGS := tests

LOCAL_PACKAGE_NAME := CameraTooTests

LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE  := $(LOCAL_PATH)/../../../../NOTICE

LOCAL_INSTRUMENTATION_FOR := CameraToo

LOCAL_SDK_VERSION := current

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

LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules mockito-target-minus-junit4



include $(BUILD_PACKAGE)

tests/Camera2Tests/CameraToo/tests/AndroidTest.xml

0 → 100644
+30 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2023 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.

-->

<configuration description="Runs CameraToo tests.">

    <option name="test-suite-tag" value="apct" />

    <option name="test-suite-tag" value="apct-instrumentation" />



    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">

        <option name="cleanup-apks" value="true" />

        <option name="test-file-name" value="CameraTooTests.apk" />

        <option name="test-file-name" value="CameraToo.apk" />

    </target_preparer>



    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="package" value="com.example.android.camera2.cameratoo.tests" />

        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />

    </test>

</configuration>