summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemi NGUYEN VAN <reminv@google.com>2020-07-08 00:23:11 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-08 00:23:11 +0000
commit1e7abb1e90311abeea8a0c3d83dc4c374c5aa662 (patch)
tree19fe308ac18495c77cc613bcba921c044989ab1e
parent63e923abc2206a4df91135a8ab0e91d66aa6d9ad (diff)
parent333f3c1db96e0e0648e73b383a893ec6c29dbbd0 (diff)
Merge "Use the R API statsd library on R NetworkStack" into rvc-dev am: 333f3c1db9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/12084811 Change-Id: I13393653b55d8129dd14731d0db986f6299ce9c0
-rw-r--r--Android.bp11
1 files changed, 1 insertions, 10 deletions
diff --git a/Android.bp b/Android.bp
index ae19a1c..37e001c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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: [
@@ -254,15 +254,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"],
cmd: "$(location stats-log-api-gen) --java $(out) --module network_stack" +