commit eb18d3986fcba3904b3b9ca6f5f7f0dcac433ccb
author Sunny Goyal <sunnygoyal@google.com> Fri Feb 07 16:48:14 2020 -0800
committer Sunny Goyal <sunnygoyal@google.com> Thu Feb 20 03:07:52 2020 +0000
tree 47df7d617c49296ba9fabfa8767f3c9af32931d4
parent 80def300765428bcfc2e96e1afed23dcf8a2dd4f

Separating packageName from the AndroidManifest

Test: Verified everything builds
Change-Id: Icd425e004d8420b8c7a5d221ef98ffbc22723f04

packages/SystemUI/Android.bp

diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
index de174b1..e066230 100644
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -86,7 +86,9 @@
 
 android_library {
     name: "SystemUI-tests",
-    manifest: "tests/AndroidManifest.xml",
+    manifest: "tests/AndroidManifest-base.xml",
+    additional_manifests: ["tests/AndroidManifest.xml"],
+
     resource_dirs: [
         "tests/res",
         "res-product",