Merge history of packages/Connectivity
Modified Visibility / Includes for:
- Tethering/common/TetheringLib/Android.bp
Modified License Import for:
- framework/Android.bp
- service/Android.bp
- tests/common/Android.bp
- tests/deflake/Android.bp
- tests/integration/Android.bp
- tests/smoketest/Android.bp
- tests/unit/Android.bp
- tests/unit/jni/Android.bp
Modified Lint mapping for:
- framework/lint-baseline.xml
- service/lint-baseline.xml
BUG: 186628461
TEST: TH
Merged-In: Ie82d0fb34bda77543e31c82660c6f315efa87f62
Change-Id: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
diff --git a/tests/integration/Android.bp b/tests/integration/Android.bp
new file mode 100644
index 0000000..81f9b48
--- /dev/null
+++ b/tests/integration/Android.bp
@@ -0,0 +1,74 @@
+//
+// 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.
+//
+
+package {
+ // See: http://go/android-license-faq
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test {
+ name: "FrameworksNetIntegrationTests",
+ defaults: ["framework-connectivity-test-defaults"],
+ platform_apis: true,
+ certificate: "platform",
+ srcs: [
+ "src/**/*.kt",
+ "src/**/*.aidl",
+ ],
+ libs: [
+ "android.test.mock",
+ ],
+ static_libs: [
+ "NetworkStackApiStableLib",
+ "androidx.test.ext.junit",
+ "frameworks-net-integration-testutils",
+ "kotlin-reflect",
+ "mockito-target-extended-minus-junit4",
+ "net-tests-utils",
+ "service-connectivity",
+ "services.core",
+ "services.net",
+ "testables",
+ ],
+ test_suites: ["device-tests"],
+ use_embedded_native_libs: true,
+ jni_libs: [
+ // For mockito extended
+ "libdexmakerjvmtiagent",
+ "libstaticjvmtiagent",
+ // android_library does not include JNI libs: include NetworkStack dependencies here
+ "libnativehelper_compat_libc++",
+ "libnetworkstackutilsjni",
+ ],
+}
+
+// Utilities for testing framework code both in integration and unit tests.
+java_library {
+ name: "frameworks-net-integration-testutils",
+ defaults: ["framework-connectivity-test-defaults"],
+ srcs: ["util/**/*.java", "util/**/*.kt"],
+ static_libs: [
+ "androidx.annotation_annotation",
+ "androidx.test.rules",
+ "junit",
+ "net-tests-utils",
+ ],
+ libs: [
+ "service-connectivity",
+ "services.core",
+ "services.net",
+ ],
+}