diff options
| author | 2020-02-19 06:27:09 +0000 | |
|---|---|---|
| committer | 2020-02-19 06:27:09 +0000 | |
| commit | cd5bb94e55659293166b909b1757739325df2d26 (patch) | |
| tree | 9af3fa566af390da5ad6684147d9977d8fb1af67 | |
| parent | 049ddf375f193bda035d7f4c667132ef0a71db9e (diff) | |
| parent | d87589549ff62de28cced0b9d7207f7613afce43 (diff) | |
Merge "Turn off cpp aidlgen, link libstatssocket as share"
| -rw-r--r-- | apex/statsd/aidl/Android.bp | 2 | ||||
| -rw-r--r-- | tools/stats_log_api_gen/Android.bp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/apex/statsd/aidl/Android.bp b/apex/statsd/aidl/Android.bp index 7c93bc73e45d..f7a817667f30 100644 --- a/apex/statsd/aidl/Android.bp +++ b/apex/statsd/aidl/Android.bp @@ -34,7 +34,7 @@ aidl_interface { enabled: false, // the platform uses statsd_java_aidl }, cpp: { - enabled: true, + enabled: false, }, ndk: { enabled: true, diff --git a/tools/stats_log_api_gen/Android.bp b/tools/stats_log_api_gen/Android.bp index e566d27d92f0..d5031d7d4628 100644 --- a/tools/stats_log_api_gen/Android.bp +++ b/tools/stats_log_api_gen/Android.bp @@ -121,9 +121,8 @@ cc_library { shared_libs: [ "liblog", "libcutils", + "libstatssocket", ], - static_libs: ["libstatssocket"], - apex_available: [ "//apex_available:platform", //TODO(b/149781190): Remove this once statsd no longer depends on libstatslog |