From 31003c48c12201a914c68c0a15053a6a8bf5b1c3 Mon Sep 17 00:00:00 2001
From: Todd Kennedy <toddke@google.com>
Date: Mon, 2 May 2016 23:54:08 +0000
Subject: [PATCH] Revert "Add shim app for CTS testing"

Build errors when trying to dex2oat the CtsShim prebuilt even though it's marked with "hasCode=false".

This reverts commit d987a11126e9c6d58cf02137971e424eb0a735da.

Change-Id: If47b3bcd4c727da7acd9068c02f8fb671ed0ae84
---
 target/product/core_minimal.mk | 5 ++---
 target/product/core_tiny.mk    | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 627d496bfb..0b5ace166a 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -24,17 +24,16 @@ PRODUCT_NAME := core
 
 PRODUCT_PACKAGES += \
     BackupRestoreConfirmation \
-    CtsShimPrivPrebuilt \
-    DownloadProvider \
+    WallpaperBackup \
     ExtShared \
     ExtServices \
+    DownloadProvider \
     HTMLViewer \
     MediaProvider \
     PackageInstaller \
     SettingsProvider \
     Shell \
     StatementService \
-    WallpaperBackup \
     bcc \
     bu \
     com.android.future.usb.accessory \
diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
index 58b75ea786..f9ec0328fa 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -37,13 +37,12 @@ PRODUCT_PACKAGES += \
 
 PRODUCT_PACKAGES += \
     BackupRestoreConfirmation \
-    CtsShimPrivPrebuilt \
+    WallpaperBackup \
     DefaultContainerService \
     ExtShared \
     ExtServices \
     SettingsProvider \
     Shell \
-    WallpaperBackup \
     bcc \
     bu \
     com.android.location.provider \