commit ad66683fc07f2f8d48d0837ae8be3001515a19b0
author Patrick Rohr <prohr@google.com> Thu Sep 29 00:45:30 2022 -0700
committer Patrick Rohr <prohr@google.com> Thu Nov 03 15:26:41 2022 -0700
tree 726648caf8a83ba2470d0f0653c5aaabb63855cb
parent 0f2ef7cc30359d2d90587bffa3e302db16d846c1

cronet: jarjar androidx inside cronet

To make sure cronet's androidx does not conflict with anything.

Test: atest CronetApiTest
Change-Id: Iad05e489a82a27c2cb7be1e115359efec6bef907

Cronet/Android.bp

diff --git a/Cronet/Android.bp b/Cronet/Android.bp
index 2e7e7cf..3ce88ef 100644
--- a/Cronet/Android.bp
+++ b/Cronet/Android.bp
@@ -97,6 +97,7 @@
         "cronet_impl_platform_java",
     ],
     apex_available: ["com.android.tethering"],
+    jarjar_rules: "jarjar-rules.txt",
     unsafe_ignore_missing_latest_api: true,
     dist_group: "android",
     // cronet is used as a shared library.

Cronet/jarjar-rules.txt

diff --git a/Cronet/jarjar-rules.txt b/Cronet/jarjar-rules.txt
new file mode 100644
index 0000000..7111ebc
--- /dev/null
+++ b/Cronet/jarjar-rules.txt
@@ -0,0 +1,3 @@
+rule androidx.** com.android.cronet.@0
+rule android.support.** com.android.cronet.@0
+