diff --git a/core/main.mk b/core/main.mk
index f7849a2..812fd93 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -643,7 +643,7 @@
   # TODO: Should we do this for all builds and not just the sdk?
   $(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES), \
     $(if $(strip $(ALL_MODULES.$(m).INSTALLED)),,\
-      $(warning $(ALL_MODULES.$(m).MAKEFILE): Module '$(m)' in PRODUCT_PACKAGES has nothing to install!)))
+      $(error $(ALL_MODULES.$(m).MAKEFILE): Module '$(m)' in PRODUCT_PACKAGES has nothing to install!)))
   $(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES_DEBUG), \
     $(if $(strip $(ALL_MODULES.$(m).INSTALLED)),,\
       $(warning $(ALL_MODULES.$(m).MAKEFILE): Module '$(m)' in PRODUCT_PACKAGES_DEBUG has nothing to install!)))
diff --git a/target/product/embedded.mk b/target/product/embedded.mk
index 7f681b1..0830101 100644
--- a/target/product/embedded.mk
+++ b/target/product/embedded.mk
@@ -50,7 +50,6 @@
     libstdc++ \
     libstlport \
     libsurfaceflinger \
-    libsurfaceflinger_client \
     libsurfaceflinger_ddmconnection \
     libsysutils \
     libthread_db \
diff --git a/target/product/emulator.mk b/target/product/emulator.mk
index 1dcdc60..b0cc04b 100644
--- a/target/product/emulator.mk
+++ b/target/product/emulator.mk
@@ -37,11 +37,6 @@
 
 PRODUCT_PACKAGES += \
     egl.cfg \
-    gles_emul.cfg \
-    libGLESv1_CM_emul \
-    libGLESv2_emul \
-    libEGL_emul \
-    libut_rendercontrol_enc \
     gralloc.goldfish \
     libGLESv1_CM_emulation \
     lib_renderControl_enc \