diff --git a/Android.bp b/Android.bp
index 5070b5e..6b18c2d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -390,7 +390,7 @@
 
 filegroup {
     name: "framework-jarjar-rules",
-    srcs: ["jarjar_rules_hidl.txt"],
+    srcs: ["framework_jarjar_rules.txt"],
 }
 
 filegroup {
@@ -467,6 +467,7 @@
     srcs: [":framework-all-sources"],
     installable: false,
     libs: ["app-compat-annotations"],
+    static_libs: ["exoplayer2-core"]
 }
 
 java_library {
@@ -479,6 +480,9 @@
         "unsupportedappusage-annotation-processor",
         "compat-changeid-annotation-processor",
     ],
+    static_libs: [
+        "exoplayer2-core"
+    ]
 }
 
 platform_compat_config {