commit 87fccf07208189eaa0df1fb25c8d8141516eaced
author Sunny Goyal <sunnygoyal@google.com> Tue Aug 13 17:39:10 2019 -0700
committer Sunny Goyal <sunnygoyal@google.com> Wed Aug 14 12:08:44 2019 -0700
tree 598153d9268ab9162b0912f2c2a741478e54d103
parent 77e02da8b3c0c0e6f7d3a7696ef473a3856ead5e

Removing unnecessary R.java declaration for subpackages, to make gradle setup simpler

Removed:
  com.android.settingslib.restrictedlockutils
  com.android.settingslib.helputils
  com.android.keyguard

Moving sysui settings to use sysui settings resource package name

Test: Everything compiles / presubmit
Bug: 130289146
Change-Id: I5d760fa2f04439d24b455839f7bdd5cc499e840f

packages/SystemUI/Android.bp

diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
index 4c52b132..636b90a 100644
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -71,10 +71,6 @@
         "telephony-common",
     ],
 
-    aaptflags: [
-        "--extra-packages",
-        "com.android.keyguard",
-    ],
     kotlincflags: ["-Xjvm-default=enable"],
 
     plugins: ["dagger2-compiler-2.19"],
@@ -132,7 +128,7 @@
     kotlincflags: ["-Xjvm-default=enable"],
     aaptflags: [
         "--extra-packages",
-        "com.android.keyguard:com.android.systemui",
+        "com.android.systemui",
     ],
     plugins: ["dagger2-compiler-2.19"],
 }
@@ -160,10 +156,6 @@
     kotlincflags: ["-Xjvm-default=enable"],
 
     dxflags: ["--multi-dex"],
-    aaptflags: [
-        "--extra-packages",
-        "com.android.keyguard",
-    ],
     required: ["privapp_whitelist_com.android.systemui"],
 
 }
@@ -180,10 +172,6 @@
     privileged: true,
 
     dxflags: ["--multi-dex"],
-    aaptflags: [
-        "--extra-packages",
-        "com.android.keyguard",
-    ],
     optimize: {
         proguard_flags_files: ["proguard.flags", "legacy/recents/proguard.flags"],
     },