Merge "Set jni_uses_sdk_apis for NetworkStackTests" am: ac7d9c6c1e (9b376a79) · Commits · e / os / android_packages_modules_NetworkStack

tests/integration/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ java_defaults {
		// For NetworkStackUtils included in NetworkStackBase
		"libnetworkstackutilsjni",
		],
		jni_uses_sdk_apis: true,
		visibility: ["//visibility:private"],
		}

+1 −29

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ java_defaults {
		"libstaticjvmtiagent",
		"libnetworkstackutilsjni",
		],
		jni_uses_sdk_apis: true,
		jarjar_rules: ":NetworkStackJarJarRules",
		}

		@@ -80,36 +81,7 @@ android_test {
		java_defaults {
		name: "libnetworkstackutilsjni_deps",
		jni_libs: [
		"libbacktrace",
		"libbase",
		"libbinder",
		"libc++",
		"libcgrouprc",
		"libcrypto",
		"libcutils",
		"ld-android",
		"libdl_android",
		"libhidl-gen-utils",
		"libhidlbase",
		"libjsoncpp",
		"liblog",
		"liblzma",
		"libnativehelper",
		"libnativehelper_compat_libc++",
		"libnetworkstacktestsjni",
		"libpackagelistparser",
		"libpcre2",
		"libprocessgroup",
		"libselinux",
		"libui",
		"libutils",
		"libvintf",
		"libvndksupport",
		"libtinyxml2",
		"libunwindstack",
		"libutilscallstack",
		"libziparchive",
		"libz",
		"netd_aidl_interface-cpp",
		],
		}