commit 29147927c4bdfb08d73147a35972b792d851d2fe
author Amit Mahajan <amitmahajan@google.com> Sat Nov 23 01:23:21 2019 +0000
committer Amit Mahajan <amitmahajan@google.com> Sat Nov 23 01:23:21 2019 +0000
tree d4cb8e701a16c57977003c79688b9b58234a919e
parent b20ddc82a2801d6fc499127262431f49482e1608

Revert "Split TeleService into a client apk and a lib."

This reverts commit b20ddc82a2801d6fc499127262431f49482e1608.

Reason for revert: TeleServiceLib compilation on eng builds goes on indefinitely.

Change-Id: I3f4b7245a91e1ad53f3e16624435e625cd76096b

Android.bp

diff --git a/Android.bp b/Android.bp
index 9449334..5590126 100644
--- a/Android.bp
+++ b/Android.bp
@@ -16,7 +16,7 @@
 // for the 'other' dialer.
 
 android_app {
-    name: "TeleServiceLib",
+    name: "TeleService",
 
     libs: [
         "telephony-common",
@@ -58,12 +58,8 @@
 
     aaptflags: [
         "--extra-packages com.android.services.telephony.sip",
-        "--shared-lib",
-        "--extra-packages com.android.phone",
     ],
 
-    export_package_resources: true,
-
     platform_apis: true,
 
     certificate: "platform",
@@ -73,7 +69,6 @@
         proguard_flags_files: [
             "proguard.flags",
             "sip/proguard.flags",
-            "proguard.proguard",
         ],
     },