commit 750fe996da0dd379511cc5de0dfc744fc7b5a339
author Amit Mahajan <amitmahajan@google.com> Wed Feb 05 01:41:40 2020 +0000
committer Amit Mahajan <amitmahajan@google.com> Tue Feb 04 18:18:45 2020 -0800
tree 8b9144674e583ae309ba7d4f9a839bcdfec3d8fd
parent 19c185f4344a744c27a6fa12f5976c857439dfa1

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

This reverts commit 7412ad8dabaa6d028e30726fe75c46e47d0654b0.

Reason for revert: b/148821604

Change-Id: I18889d2d5b6861c6fd0e8c41eb72c3bc2e8ffb99

Android.bp

diff --git a/Android.bp b/Android.bp
index 662faa6..1887a8a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -16,7 +16,7 @@
 // for the 'other' dialer.
 
 android_app {
-    name: "TeleServiceLib",
+    name: "TeleService",
 
     libs: [
         "telephony-common",
@@ -59,12 +59,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",
@@ -74,7 +70,6 @@
         proguard_flags_files: [
             "proguard.flags",
             "sip/proguard.flags",
-            "proguard.proguard",
         ],
     },