Merge "Convert tests/ProtoInputStreamTests/Android.mk file to Android.bp" am: 4497c97891 am: 3036f3d732

Change-Id: Icc2f93cf7751223f3010231edf932e5c036ffd65
This commit is contained in:
Alexander Smundak
2020-05-20 21:03:55 +00:00
committed by Automerger Merge Worker
2 changed files with 33 additions and 34 deletions

View File

@@ -0,0 +1,33 @@
// 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.
android_test {
name: "ProtoInputStreamTests",
proto: {
type: "nano",
},
srcs: [
"src/**/*.java",
"src/**/*.proto",
],
platform_apis: true,
certificate: "platform",
test_suites: ["device-tests"],
libs: ["android.test.runner"],
static_libs: [
"androidx.test.rules",
"frameworks-base-testutils",
"mockito-target-minus-junit4",
],
}

View File

@@ -1,34 +0,0 @@
# 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.
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := ProtoInputStreamTests
LOCAL_PROTOC_OPTIMIZE_TYPE := nano
LOCAL_MODULE_TAGS := tests optional
LOCAL_SRC_FILES := \
$(call all-java-files-under, src) \
$(call all-proto-files-under, src)
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_CERTIFICATE := platform
LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := \
androidx.test.rules \
frameworks-base-testutils \
mockito-target-minus-junit4
include $(BUILD_PACKAGE)