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

Commit 734f2954 authored by Sasha Smundak's avatar Sasha Smundak Committed by android-build-merger
Browse files

Merge "Convert misc tests Android.mk files to Android.bp" am: ce22e112

am: 86e0168d

Change-Id: I4a803f390f332d0c018cda1f0085a5da5201641d
parents 4932896e 86e0168d
Loading
Loading
Loading
Loading
+24 −0
Original line number Diff line number Diff line
subdirs = ["accessorychat"]
//
// Copyright (C) 2011 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.
//

android_test {
    name: "AccessoryChat",

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

    platform_apis: true,

}
+0 −28
Original line number Diff line number Diff line
#
# Copyright (C) 2011 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_SRC_FILES := $(call all-subdir-java-files)

LOCAL_PACKAGE_NAME := AccessoryChat

LOCAL_PRIVATE_PLATFORM_APIS := true

include $(BUILD_PACKAGE)
+33 −0
Original line number Diff line number Diff line
// Copyright 2011, 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.

android_test {
    name: "NfcExtrasTests",

    // We only want this apk build for tests.

    libs: [
        "android.test.runner.stubs",
        "com.android.nfc_extras.stubs",
        "android.test.base.stubs",
    ],

    static_libs: ["junit"],

    // Include all test java files.
    srcs: ["src/**/*.java"],

    sdk_version: "current",

}

nfc-extras/tests/Android.mk

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line
# Copyright 2011, 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)

# We only want this apk build for tests.
LOCAL_MODULE_TAGS := tests

LOCAL_JAVA_LIBRARIES := \
    android.test.runner.stubs \
    com.android.nfc_extras.stubs \
    android.test.base.stubs

LOCAL_STATIC_JAVA_LIBRARIES := junit

# Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src)

LOCAL_PACKAGE_NAME := NfcExtrasTests

LOCAL_SDK_VERSION := current

include $(BUILD_PACKAGE)