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

Commit 7d6c615c authored by Sasha Smundak's avatar Sasha Smundak Committed by android-build-merger
Browse files

Merge "Convert core/tests/**/Android.mk file to Android.bp" am: d0fc8c9d

am: 37c0949b

Change-Id: Ia4e91ee9eb77fbd5d9063ce28506fe60b86aec36
parents 1de554dd 37c0949b
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
android_app {
    name: "bttraffic",
    srcs: ["src/**/*.java"],
    resource_dirs: ["res"],
    sdk_version: "current",
    certificate: "platform",
}

core/tests/BTtraffic/Android.mk

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)

LOCAL_MODULE_TAGS := optional

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

LOCAL_RESOURCE_DIR := \
    $(LOCAL_PATH)/res

LOCAL_PACKAGE_NAME := bttraffic
LOCAL_SDK_VERSION := current
LOCAL_CERTIFICATE := platform

include $(BUILD_PACKAGE)

include $(call all-makefiles-under,$(LOCAL_PATH))
+26 −0
Original line number Diff line number Diff line
// Copyright (C) 2010, 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: "ConnectivityManagerTest",
    libs: [
        "android.test.runner",
        "android.test.base",
    ],
    static_libs: ["junit"],
    // Include all test java files.
    srcs: ["src/**/*.java"],
    platform_apis: true,
    certificate: "platform",
}
+0 −32
Original line number Diff line number Diff line
# Copyright (C) 2010, 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 android.test.base
LOCAL_STATIC_JAVA_LIBRARIES := junit

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

LOCAL_PACKAGE_NAME := ConnectivityManagerTest
LOCAL_PRIVATE_PLATFORM_APIS := true

LOCAL_CERTIFICATE := platform

include $(BUILD_PACKAGE)
+7 −0
Original line number Diff line number Diff line
android_app {
    name: "svcmonitor",
    srcs: ["src/**/*.java"],
    resource_dirs: ["res"],
    sdk_version: "current",
    certificate: "platform",
}
Loading