1 files changed, 26 insertions, 5 deletions

diff --git a/Android.bp b/Android.bp
index 9411eeca834c..d7b37288934a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -191,12 +191,20 @@ filegroup {
     path: "telephony/java",
 }
 
+genrule {
+    name: "statslog-telephony-common-java-gen",
+    tools: ["stats-log-api-gen"],
+    cmd: "$(location stats-log-api-gen) --java $(out) --module telephony_common"
+        + " --javaPackage com.android.internal.telephony --javaClass TelephonyCommonStatsLog",
+    out: ["com/android/internal/telephony/TelephonyCommonStatsLog.java"],
+}
+
 filegroup {
     name: "framework-telephony-common-sources",
     srcs: [
         "telephony/common/**/*.java",
+        ":statslog-telephony-common-java-gen",
     ],
-    path: "telephony/common",
 }
 
 filegroup {
@@ -265,7 +273,8 @@ filegroup {
 
         // etc.
         ":framework-javastream-protos",
-        ":framework-statslog-gen",
+        ":framework-statslog-gen", // StatsLogInternal.java
+        ":statslog-framework-java-gen", // FrameworkStatsLog.java
 
         // telephony annotations
         ":framework-telephony-annotations",
@@ -533,7 +542,7 @@ java_library {
     srcs: [":framework-all-sources"],
     installable: false,
     static_libs: [
-        "exoplayer2-core",
+        "exoplayer2-extractor",
         "android.hardware.wifi-V1.0-java-constants",
     ],
     libs: ["icing-java-proto-lite"],
@@ -553,7 +562,7 @@ java_library {
         "compat-changeid-annotation-processor",
     ],
     static_libs: [
-        "exoplayer2-core",
+        "exoplayer2-extractor",
         "android.hardware.wifi-V1.0-java-constants",
     ]
 }
@@ -604,6 +613,14 @@ genrule {
     out: ["android/util/StatsLogInternal.java"],
 }
 
+genrule {
+    name: "statslog-framework-java-gen",
+    tools: ["stats-log-api-gen"],
+    cmd: "$(location stats-log-api-gen) --java $(out) --module framework" +
+         " --javaPackage com.android.internal.util --javaClass FrameworkStatsLog --worksource",
+    out: ["com/android/internal/util/FrameworkStatsLog.java"],
+}
+
 gensrcs {
     name: "framework-javastream-protos",
     depfile: true,
@@ -1267,7 +1284,11 @@ metalava_framework_docs_args = "--manifest $(location core/res/AndroidManifest.x
     "--hide MissingPermission --hide BroadcastBehavior " +
     "--hide HiddenSuperclass --hide DeprecationMismatch --hide UnavailableSymbol " +
     "--hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo " +
-    "--force-convert-to-warning-nullability-annotations +*:-android.*:+android.icu.*:-dalvik.*"
+    "--force-convert-to-warning-nullability-annotations +*:-android.*:+android.icu.*:-dalvik.* " +
+    "--api-lint-ignore-prefix android.icu. " +
+    "--api-lint-ignore-prefix java. " +
+    "--api-lint-ignore-prefix junit. " +
+    "--api-lint-ignore-prefix org. "
 
 build = [
     "StubLibraries.bp",