Merge "Revert "Generate stable version of NetworkStackStatsLog"" (d598ce3f) · Commits · e / os / android_packages_modules_NetworkStack

Android.bp

+4 −14

Original line number	Diff line number	Diff line
		@@ -111,7 +111,7 @@ android_library {
		srcs: [
		":NetworkStackApiCurrentShims",
		"src/*/.java",
		":statslog-networkstack-java-gen-current"
		":statslog-networkstack-java-gen"
		],
		manifest: "AndroidManifestBase.xml",
		}
		@@ -130,7 +130,7 @@ android_library {
		defaults: ["NetworkStackReleaseApiLevel"],
		srcs: [
		"src/*/.java",
		":statslog-networkstack-java-gen-stable",
		":statslog-networkstack-java-gen",
		],
		// API stable uses a jarjared version of the shims
		static_libs: [
		@@ -261,24 +261,14 @@ cc_library_shared {
		}

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

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


		version_code_networkstack_next = "300000000"
		version_code_networkstack_test = "999999999"