Revert "Generate stable version of NetworkStackStatsLog"
This reverts commit d57e021b70bb6def139c224ea3383a694c3317f8.
Reason for revert: Breaks Q devices, b/179676629
Change-Id: I3fe760def968b70b06cbda6c69af89d5ce6fb570
diff --git a/Android.bp b/Android.bp
index 17b57c9..951b160 100644
--- a/Android.bp
+++ b/Android.bp
@@ -111,7 +111,7 @@
srcs: [
":NetworkStackApiCurrentShims",
"src/**/*.java",
- ":statslog-networkstack-java-gen-current"
+ ":statslog-networkstack-java-gen"
],
manifest: "AndroidManifestBase.xml",
}
@@ -130,7 +130,7 @@
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 @@
}
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"
