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/Tethering/apex/Android.bp b/Tethering/apex/Android.bp
index f4250cc..4ccad22 100644
--- a/Tethering/apex/Android.bp
+++ b/Tethering/apex/Android.bp
@@ -138,7 +138,11 @@
// Changed in sc-mainline-prod only: no list for
// framework-connectivity-tiramisu APIs as it is not in the APEX
],
- unsupported: ["hiddenapi/hiddenapi-unsupported.txt"],
+ unsupported: [
+ "hiddenapi/hiddenapi-unsupported.txt",
+ // Changed in sc-mainline-prod only: no framework-connectivity-tiramisu
+ // "hiddenapi/hiddenapi-unsupported-tiramisu.txt",
+ ],
},
}