Merge "Disable aidl tag tracing in libbinder_aidl_test_stub"
diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index 4ff629d..7080c7b 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -486,6 +486,9 @@
         java: {
             enabled: false,
         },
+        cpp: {
+            gen_trace: false,
+        },
     },
 }