Merge "Use autogenerated StatsLog that is Q-friendly" (ef60e461) · Commits · e / os / android_packages_modules_NetworkStack

Android.bp

+18 −3

Original line number	Diff line number	Diff line
		@@ -81,7 +81,6 @@ java_defaults {
		name: "NetworkStackAndroidLibraryDefaults",
		srcs: [
		":framework-networkstack-shared-srcs",
		":statslog-networkstack-java-gen",
		],
		libs: ["unsupportedappusage"],
		static_libs: [
		@@ -103,7 +102,11 @@ java_defaults {
		android_library {
		name: "NetworkStackApiCurrentLib",
		defaults: ["NetworkStackApiCurrentLevel", "NetworkStackAndroidLibraryDefaults"],
		srcs: [":NetworkStackApiCurrentShims", "src/*/.java"],
		srcs: [
		":NetworkStackApiCurrentShims",
		"src/*/.java",
		":statslog-networkstack-java-gen"
		],
		manifest: "AndroidManifestBase.xml",
		}

		@@ -119,7 +122,10 @@ java_library {
		android_library {
		name: "NetworkStackApiStableLib",
		defaults: ["NetworkStackApiStableLevel"],
		srcs: ["src/*/.java"],
		srcs: [
		"src/*/.java",
		":statslog-networkstack-java-gen-q",
		],
		// API stable uses a jarjared version of the shims
		static_libs: [
		"NetworkStackApiStableDependencies",
		@@ -219,6 +225,15 @@ cc_library_shared {
		],
		}

		genrule {
		name: "statslog-networkstack-java-gen-q",
		tools: ["stats-log-api-gen"],
		cmd: "$(location stats-log-api-gen) --java $(out) --module network_stack" +
		" --javaPackage com.android.networkstack.metrics --javaClass NetworkStackStatsLog" +
		" --compileQ",
		out: ["com/android/networkstack/metrics/NetworkStackStatsLog.java"],
		}

		genrule {
		name: "statslog-networkstack-java-gen",
		tools: ["stats-log-api-gen"],