commit 67caf6d0ebb6d632de041ba93a43b63279e652c9
author Amit Mahajan <amitmahajan@google.com> Fri Dec 13 08:25:44 2019 +0000
committer Amit Mahajan <amitmahajan@google.com> Fri Dec 13 00:33:42 2019 -0800
tree 8f1e6cac76f402578df85ff6983879e33a73a553
parent 4e62c65a0ded0c1fb1b20645eaf342f44f0c4e6d

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

This reverts commit 14e676a84b9adf52f2d0660b93a53afdb7edcb0f.

Reason for revert: b/146034680 - cause is that resource overlays are not working.
Bug: 146034680
Bug: 144806641

Merged-in: Iaf897c2b38c92b1c9be74c9705520f462d58785b
Change-Id: I3fb9d6f3ee68b6e4637e7fb602afd30a99b2f5af

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index de44863..22b40b5 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -29,7 +29,7 @@
     platform_apis: true,
     certificate: "platform",
 
-    instrumentation_for: "TeleServiceLib",
+    instrumentation_for: "TeleService",
 
     static_libs: [
         "androidx.test.rules",