diff options
author | Remi NGUYEN VAN <reminv@google.com> | 2020-07-08 00:37:19 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-08 00:37:19 +0000 |
commit | 1d164fac404714dbc247708f7b52aa7cd88eb83a (patch) | |
tree | 7ccfe8167b4b8d5bd1f77615be4ae803f55072d6 | |
parent | e99c5ee2051025f5c7f9225f4576d5123e30a6e8 (diff) | |
parent | 1e7abb1e90311abeea8a0c3d83dc4c374c5aa662 (diff) |
Merge "Use the R API statsd library on R NetworkStack" into rvc-dev am: 333f3c1db9 am: 1e7abb1e90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/12084811
Change-Id: Iaa672e6e7c500fa4ba54df58875d67e3c57d8413
-rw-r--r-- | Android.bp | 11 |
1 files changed, 1 insertions, 10 deletions
@@ -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" + |