Merge "Correct FrameworksNetTests-jni-defaults lib" am: fa71b4f4a0 am: 4e3ec1f018 am: fb7a5f06b7 (fcd34bb8) · Commits · e / os / android_frameworks_base

tests/net/Android.bp

+20 −20

Original line number	Diff line number	Diff line
		@@ -3,22 +3,6 @@
		//########################################################################
		java_defaults {
		name: "FrameworksNetTests-jni-defaults",
		static_libs: [
		"FrameworksNetCommonTests",
		"frameworks-base-testutils",
		"framework-protos",
		"androidx.test.rules",
		"mockito-target-minus-junit4",
		"net-tests-utils",
		"platform-test-annotations",
		"services.core",
		"services.net",
		],
		libs: [
		"android.test.runner",
		"android.test.base",
		"android.test.mock",
		],
		jni_libs: [
		"ld-android",
		"libartbase",
		@@ -44,20 +28,20 @@ java_defaults {
		"libnativehelper",
		"libnetdbpf",
		"libnetdutils",
		"libnetworkstatsfactorytestjni",
		"libpackagelistparser",
		"libpcre2",
		"libprocessgroup",
		"libselinux",
		"libui",
		"libutils",
		"libvndksupport",
		"libtinyxml2",
		"libui",
		"libunwindstack",
		"libutils",
		"libutilscallstack",
		"libvndksupport",
		"libziparchive",
		"libz",
		"netd_aidl_interface-V2-cpp",
		"libnetworkstatsfactorytestjni",
		],
		}

		@@ -68,4 +52,20 @@ android_test {
		platform_apis: true,
		test_suites: ["device-tests"],
		certificate: "platform",
		static_libs: [
		"androidx.test.rules",
		"FrameworksNetCommonTests",
		"frameworks-base-testutils",
		"framework-protos",
		"mockito-target-minus-junit4",
		"net-tests-utils",
		"platform-test-annotations",
		"services.core",
		"services.net",
		],
		libs: [
		"android.test.runner",
		"android.test.base",
		"android.test.mock",
		],
		}

+6 −1

Original line number	Diff line number	Diff line
		@@ -14,4 +14,9 @@ android_test {
		defaults: ["FrameworksNetTests-jni-defaults"],
		srcs: ["java/SmokeTest.java"],
		test_suites: ["device-tests"],
		static_libs: [
		"androidx.test.rules",
		"mockito-target-minus-junit4",
		"services.core",
		],
		}
		No newline at end of file