omni: always build OmniStoreInstaller and remove PRODUCT_EXCLUDE_EXTRA_PACKAGES
its the default now
Change-Id: I90b69a369724e71e8efa9d8b0ca4c53a05254da8
diff --git a/utils/omni_emulator/packages.mk b/utils/omni_emulator/packages.mk
index fb3d901..3f789cd 100644
--- a/utils/omni_emulator/packages.mk
+++ b/utils/omni_emulator/packages.mk
@@ -7,6 +7,7 @@
MatLog \
OmniChange \
OmniOverlayStub \
+ OmniStoreInstallerPrebuilt \
omni-overlays \
OpenDelta \
ThemePicker \
@@ -15,24 +16,23 @@
WallpaperCropper2
#PRODUCT_PACKAGES += \
- GoldfishParts \
+ GoldfishParts
-ifneq ($(PRODUCT_EXCLUDE_EXTRA_PACKAGES),true)
+ifeq ($(BOARD_INCLUDE_CMDLINE_TOOLS),true)
PRODUCT_PACKAGES += \
- ChromeModernPublic \
- ExactCalculator \
- MusicFX \
- Phonograph
-else
-PRODUCT_PACKAGES += \
- OmniStoreInstaller
-endif
-
-# Additional tools
-PRODUCT_PACKAGES += \
- bash \
htop \
- vim
+ zip
+
+# Openssh
+PRODUCT_PACKAGES += \
+ scp \
+ sftp \
+ ssh \
+ sshd \
+ sshd_config \
+ ssh-keygen \
+ start-ssh
+endif
# Telephony extension
PRODUCT_PACKAGES += telephony-ext