diff --git a/webrtc.gni b/webrtc.gni
index 7ff2246..af4d6f9 100644
--- a/webrtc.gni
+++ b/webrtc.gni
@@ -265,7 +265,6 @@
                            "*",
                            [
                              "configs",
-                             "data",
                              "public_configs",
                              "suppressed_configs",
                            ])
@@ -276,16 +275,9 @@
     if (defined(invoker.public_configs)) {
       public_configs += invoker.public_configs
     }
-    data = []
-    if (defined(invoker.data)) {
-      data += invoker.data
-    }
     if (!build_with_chromium && is_android) {
       android_manifest = webrtc_root + "test/android/AndroidManifest.xml"
       deps += [ webrtc_root + "test:native_test_java" ]
-
-      # Needed for build/android/pylib/results/presentation/test_results_presentation.py
-      data += [ "//build/android/pylib/results/" ]
     }
   }
 }
