DO NOT MERGE Add mock filegroups to deal with merge conflict problem
This is a preparing CL to cherry-pick netstats jni from git_master to
aosp. Define some mock files to deal with merge conflict problem between aosp
and sc-mainline-prod. The filegroups framework-connectivity-tiramisu-jni-sources
and services.connectivity-netstats-jni-sources is located in
framework/base which do not open for development in sc-mainline-prod.
Bug: 197717846
Test: m libservice-connectivity
Test: m com.google.android.Tethering
Ignore-AOSP-First: this is used to prevent merge conflict.
Change-Id: I33e0d699086c87ce8e940036c9a52908bbbcf6c5
diff --git a/buildstubs-t/Android.bp b/buildstubs-t/Android.bp
index 7af320f..396827f 100644
--- a/buildstubs-t/Android.bp
+++ b/buildstubs-t/Android.bp
@@ -39,7 +39,23 @@
filegroup {
name: "services.connectivity-netstats-jni-sources",
- srcs: [],
+ srcs: [
+ "stubs-src-jni/mock_com_android_server_net_NetworkStatsFactory.cpp",
+ "stubs-src-jni/mock_com_android_server_net_NetworkStatsService.cpp",
+ ],
+ visibility: [
+ "//packages/modules/Connectivity:__subpackages__",
+ ],
+}
+
+filegroup {
+ name: "framework-connectivity-tiramisu-jni-sources",
+ srcs: [
+ "stubs-src-jni/mock_android_net_TrafficStats.cpp",
+ ],
+ visibility: [
+ "//packages/modules/Connectivity:__subpackages__",
+ ],
}
// Empty replacement for framework-connectivity-tiramisu.impl and stubs,