1 files changed, 5 insertions, 15 deletions
diff --git a/packages/SystemUI/shared/Android.bp b/packages/SystemUI/shared/Android.bp
index 0fb12009e2cb..31a538c65dea 100644
--- a/packages/SystemUI/shared/Android.bp
+++ b/packages/SystemUI/shared/Android.bp
@@ -20,21 +20,11 @@ android_library {
         "src/**/I*.aidl",
     ],
 
-}
-
-android_app {
-
-    name: "SysUISharedLib",
-    platform_apis: true,
-    srcs: [
-        "src/**/*.java",
-        "src/**/I*.aidl",
+    static_libs: [
+        "PluginCoreLib"
     ],
 
-    static_libs: ["SystemUISharedLib"],
-
-    optimize: {
-        enabled: false,
-    },
-
+    // Enforce that the library is built against java 7 so that there are
+    // no compatibility issues with launcher
+    java_version: "1.7",
 }