commit 98ffa937bf6d7acc6a1964c7157c906e1a86203c
author Todd Kennedy <toddke@google.com> Tue May 03 16:11:38 2016 +0000
committer Todd Kennedy <toddke@google.com> Tue May 03 11:16:35 2016 -0700
tree 91d4d755f1e8ee3fdeab7626f234ace4bf5ba219
parent b079b50e2ae2748f77139618cd5dfb8ef06d8418

Revert "Revert "Add shim app for CTS testing""

This reverts commit 31003c48c12201a914c68c0a15053a6a8bf5b1c3.

Bug: 28398205
Change-Id: Ia884957e224f46157af31814c32c5e0e1a33b7b8

target/product/core_minimal.mk

diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 0b5ace1..627d496 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -24,16 +24,17 @@
 
 PRODUCT_PACKAGES += \
     BackupRestoreConfirmation \
-    WallpaperBackup \
+    CtsShimPrivPrebuilt \
+    DownloadProvider \
     ExtShared \
     ExtServices \
-    DownloadProvider \
     HTMLViewer \
     MediaProvider \
     PackageInstaller \
     SettingsProvider \
     Shell \
     StatementService \
+    WallpaperBackup \
     bcc \
     bu \
     com.android.future.usb.accessory \

target/product/core_tiny.mk

diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
index f9ec032..58b75ea 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -37,12 +37,13 @@
 
 PRODUCT_PACKAGES += \
     BackupRestoreConfirmation \
-    WallpaperBackup \
+    CtsShimPrivPrebuilt \
     DefaultContainerService \
     ExtShared \
     ExtServices \
     SettingsProvider \
     Shell \
+    WallpaperBackup \
     bcc \
     bu \
     com.android.location.provider \