Merge "Convert hostsidetests/net/**/Android.mk file to Android.bp" am: 9bca8f5c35
am: 69de989faf
Change-Id: I9a37e90afe4f6682187f9c5937cc552067ab9f7c
This commit is contained in:
Sasha Smundak
30
tests/cts/hostside/Android.bp
Normal file
30
tests/cts/hostside/Android.bp
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
// 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.
|
||||||
|
|
||||||
|
java_test_host {
|
||||||
|
name: "CtsHostsideNetworkTests",
|
||||||
|
defaults: ["cts_defaults"],
|
||||||
|
// Only compile source java files in this apk.
|
||||||
|
srcs: ["src/**/*.java"],
|
||||||
|
libs: [
|
||||||
|
"cts-tradefed",
|
||||||
|
"tradefed",
|
||||||
|
],
|
||||||
|
// Tag this module as a cts test artifact
|
||||||
|
test_suites: [
|
||||||
|
"cts",
|
||||||
|
"vts",
|
||||||
|
"general-tests",
|
||||||
|
],
|
||||||
|
}
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
# 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)
|
|
||||||
|
|
||||||
# Only compile source java files in this apk.
|
|
||||||
LOCAL_SRC_FILES := $(call all-java-files-under, src)
|
|
||||||
|
|
||||||
LOCAL_MODULE := CtsHostsideNetworkTests
|
|
||||||
|
|
||||||
LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed
|
|
||||||
|
|
||||||
LOCAL_CTS_TEST_PACKAGE := android.net.hostsidenetwork
|
|
||||||
|
|
||||||
# Tag this module as a cts test artifact
|
|
||||||
LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
|
|
||||||
|
|
||||||
include $(BUILD_CTS_HOST_JAVA_LIBRARY)
|
|
||||||
|
|
||||||
# Build the test APKs using their own makefiles
|
|
||||||
include $(call all-makefiles-under,$(LOCAL_PATH))
|
|
||||||
24
tests/cts/hostside/aidl/Android.bp
Normal file
24
tests/cts/hostside/aidl/Android.bp
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
// 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.
|
||||||
|
|
||||||
|
java_test_helper_library {
|
||||||
|
name: "CtsHostsideNetworkTestsAidl",
|
||||||
|
sdk_version: "current",
|
||||||
|
srcs: [
|
||||||
|
"com/android/cts/net/hostside/IMyService.aidl",
|
||||||
|
"com/android/cts/net/hostside/INetworkCallback.aidl",
|
||||||
|
"com/android/cts/net/hostside/INetworkStateObserver.aidl",
|
||||||
|
"com/android/cts/net/hostside/IRemoteSocketFactory.aidl",
|
||||||
|
],
|
||||||
|
}
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
# 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.
|
|
||||||
|
|
||||||
LOCAL_PATH := $(call my-dir)
|
|
||||||
|
|
||||||
include $(CLEAR_VARS)
|
|
||||||
LOCAL_MODULE_TAGS := tests
|
|
||||||
LOCAL_SDK_VERSION := current
|
|
||||||
LOCAL_SRC_FILES := \
|
|
||||||
com/android/cts/net/hostside/IMyService.aidl \
|
|
||||||
com/android/cts/net/hostside/INetworkCallback.aidl \
|
|
||||||
com/android/cts/net/hostside/INetworkStateObserver.aidl \
|
|
||||||
com/android/cts/net/hostside/IRemoteSocketFactory.aidl
|
|
||||||
LOCAL_MODULE := CtsHostsideNetworkTestsAidl
|
|
||||||
include $(BUILD_STATIC_JAVA_LIBRARY)
|
|
||||||
39
tests/cts/hostside/app/Android.bp
Normal file
39
tests/cts/hostside/app/Android.bp
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
//
|
||||||
|
// 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.
|
||||||
|
//
|
||||||
|
|
||||||
|
android_test_helper_app {
|
||||||
|
name: "CtsHostsideNetworkTestsApp",
|
||||||
|
defaults: ["cts_support_defaults"],
|
||||||
|
//sdk_version: "current",
|
||||||
|
platform_apis: true,
|
||||||
|
static_libs: [
|
||||||
|
"compatibility-device-util-axt",
|
||||||
|
"ctstestrunner-axt",
|
||||||
|
"ub-uiautomator",
|
||||||
|
"CtsHostsideNetworkTestsAidl",
|
||||||
|
],
|
||||||
|
libs: [
|
||||||
|
"android.test.runner.stubs",
|
||||||
|
"android.test.base.stubs",
|
||||||
|
],
|
||||||
|
srcs: ["src/**/*.java"],
|
||||||
|
// Tag this module as a cts test artifact
|
||||||
|
test_suites: [
|
||||||
|
"cts",
|
||||||
|
"vts",
|
||||||
|
"general-tests",
|
||||||
|
],
|
||||||
|
}
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
#
|
|
||||||
# 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_SDK_VERSION := current
|
|
||||||
LOCAL_PRIVATE_PLATFORM_APIS := true
|
|
||||||
LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util-axt ctstestrunner-axt ub-uiautomator \
|
|
||||||
CtsHostsideNetworkTestsAidl
|
|
||||||
|
|
||||||
LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
|
|
||||||
|
|
||||||
LOCAL_SRC_FILES := $(call all-java-files-under, src)
|
|
||||||
|
|
||||||
LOCAL_PACKAGE_NAME := CtsHostsideNetworkTestsApp
|
|
||||||
|
|
||||||
LOCAL_PROGUARD_ENABLED := disabled
|
|
||||||
LOCAL_DEX_PREOPT := false
|
|
||||||
|
|
||||||
# Tag this module as a cts test artifact
|
|
||||||
LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
|
|
||||||
|
|
||||||
include $(BUILD_CTS_SUPPORT_PACKAGE)
|
|
||||||
30
tests/cts/hostside/app2/Android.bp
Normal file
30
tests/cts/hostside/app2/Android.bp
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
//
|
||||||
|
// 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.
|
||||||
|
//
|
||||||
|
|
||||||
|
android_test_helper_app {
|
||||||
|
name: "CtsHostsideNetworkTestsApp2",
|
||||||
|
defaults: ["cts_support_defaults"],
|
||||||
|
sdk_version: "current",
|
||||||
|
static_libs: ["CtsHostsideNetworkTestsAidl"],
|
||||||
|
srcs: ["src/**/*.java"],
|
||||||
|
// Tag this module as a cts test artifact
|
||||||
|
test_suites: [
|
||||||
|
"cts",
|
||||||
|
"vts",
|
||||||
|
"general-tests",
|
||||||
|
],
|
||||||
|
certificate: ":cts-net-app",
|
||||||
|
}
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
#
|
|
||||||
# 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.
|
|
||||||
#
|
|
||||||
|
|
||||||
LOCAL_PATH := $(call my-dir)
|
|
||||||
|
|
||||||
include $(CLEAR_VARS)
|
|
||||||
|
|
||||||
LOCAL_MODULE_TAGS := tests
|
|
||||||
LOCAL_SDK_VERSION := current
|
|
||||||
LOCAL_STATIC_JAVA_LIBRARIES := CtsHostsideNetworkTestsAidl
|
|
||||||
|
|
||||||
LOCAL_SRC_FILES := $(call all-java-files-under, src)
|
|
||||||
|
|
||||||
LOCAL_PACKAGE_NAME := CtsHostsideNetworkTestsApp2
|
|
||||||
|
|
||||||
LOCAL_PROGUARD_ENABLED := disabled
|
|
||||||
LOCAL_DEX_PREOPT := false
|
|
||||||
|
|
||||||
# Tag this module as a cts test artifact
|
|
||||||
LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
|
|
||||||
|
|
||||||
LOCAL_CERTIFICATE := cts/hostsidetests/net/certs/cts-net-app
|
|
||||||
|
|
||||||
include $(BUILD_CTS_SUPPORT_PACKAGE)
|
|
||||||
4
tests/cts/hostside/certs/Android.bp
Normal file
4
tests/cts/hostside/certs/Android.bp
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
android_app_certificate {
|
||||||
|
name: "cts-net-app",
|
||||||
|
certificate: "cts-net-app",
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user