Merge "Turn off cpp aidlgen, link libstatssocket as share"

2020-02-19 06:27:09 +00:00
parent 049ddf375f d87589549f
commit cd5bb94e55
2 changed files with 2 additions and 3 deletions
--- 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,
--- 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