Unify package/imports of perfetto javastream protos
framework-jarjar-rules.txt contains a rule that renames
the package "perfetto.protos" to "android.internal.perfetto.protos".
However, the rule was not affecting the entire framework's code.
The confusing result was part of the framework importing "perfetto.protos"
and other parts importing "android.internal.perfetto.protos".
This commit adds a new library "perfetto_trace_javastream_protos_jarjar"
that provides to the entire framework the perfetto javastream protos
under a single unified package "android.internal.perfetto.protos".
Test: m framework-minus-apex
Bug: 276433199
Change-Id: Ie653c7b7b763fd97f021f89d413a7ed360946e7b
diff --git a/Android.bp b/Android.bp
index 057b1d6..b2a7418 100644
--- a/Android.bp
+++ b/Android.bp
@@ -150,7 +150,6 @@
":framework-javastream-protos",
":statslog-framework-java-gen", // FrameworkStatsLog.java
":audio_policy_configuration_V7_0",
- ":perfetto_trace_javastream_protos",
],
}
@@ -427,6 +426,7 @@
"audiopolicy-aidl-java",
"sounddose-aidl-java",
"modules-utils-expresslog",
+ "perfetto_trace_javastream_protos_jarjar",
],
}
@@ -666,6 +666,16 @@
visibility: ["//frameworks/base/api"],
}
+java_library {
+ name: "perfetto_trace_javastream_protos_jarjar",
+ srcs: [
+ ":perfetto_trace_javastream_protos",
+ ],
+ jarjar_rules: ":framework-jarjar-rules",
+ sdk_version: "core_platform",
+ installable: false,
+}
+
build = [
"AconfigFlags.bp",
"ProtoLibraries.bp",