Make change and version bump to r_aml_300900600 for mainline module file: AndroidManifest.xml (03edbf57) · Commits · e / os / android_packages_modules_NetworkStack

Android.bp

+1 −10

Original line number	Diff line number	Diff line
		@@ -128,7 +128,7 @@ android_library {
		defaults: ["NetworkStackReleaseApiLevel"],
		srcs: [
		"src/*/.java",
		":statslog-networkstack-java-gen-q",
		":statslog-networkstack-java-gen",
		],
		// API stable uses a jarjared version of the shims
		static_libs: [
		@@ -253,15 +253,6 @@ 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"],

+2 −2

Original line number	Diff line number	Diff line
		@@ -19,8 +19,8 @@
		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.android.networkstack"
		android:sharedUserId="android.uid.networkstack"
		android:versionCode="300900500"
		android:versionName="r_aml_300900500"
		android:versionCode="300900600"
		android:versionName="r_aml_300900600"
		>
		<!-- Permissions must be defined here, and not in the base manifest, as the network stack
		running in the system server process does not need any permission, and having privileged