Use autogenerated StatsLog that is Q-friendly
Statsd is introducing new APIs in R for StatsLog.
This change generates two different versions of
NetworkStackStatsLog.java, one that can be compiled using strictly Q
APIs and below, and another one that uses new APIs.
Generated NetworkStackStatsLog that only uses Q APIs:
https://paste.googleplex.com/5195949209026560
Generated NetworkStackStatsLog that uses new APIs:
https://paste.googleplex.com/5741370595606528
Bug: 148388745
Test: m NetworkStack
Test: m NetworkStackNext
Change-Id: Ibf47157dec0a9b9bddb45b6ec9c17806e6a29565
diff --git a/Android.bp b/Android.bp
index b6857ff..54bea17 100644
--- a/Android.bp
+++ b/Android.bp
@@ -81,7 +81,6 @@
name: "NetworkStackAndroidLibraryDefaults",
srcs: [
":framework-networkstack-shared-srcs",
- ":statslog-networkstack-java-gen",
],
libs: ["unsupportedappusage"],
static_libs: [
@@ -103,7 +102,11 @@
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 @@
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",
@@ -220,6 +226,15 @@
}
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"],
cmd: "$(location stats-log-api-gen) --java $(out) --module network_stack" +