Use the R API statsd library on R NetworkStack
Using the Q library causes parse errors for stats, as that library is
not forward-compatible with R. The R library is backwards-compatible
with Q and should be used on R builds.
Bug: 160656765
Test: statsd_testdrive on device with an updated NetworkStack
Change-Id: Idf3e654a679ab31d0d3c3d960f9745387edbbe4a
diff --git a/Android.bp b/Android.bp
index ae19a1c..37e001c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -128,7 +128,7 @@
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: [
@@ -254,15 +254,6 @@
}
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" +