Merge "Revert "Add shim app for CTS testing"" into nyc-dev

2016-05-02 23:56:36 +00:00
parent 6d0c367a64 31003c48c1
commit 878775fd75
2 changed files with 3 additions and 5 deletions
--- 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 \
--- 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 \