From 512b9628b0cf6dada6188e942d1f4bd5df0308aa Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Thu, 7 Mar 2013 18:28:53 -0800
Subject: [PATCH] Remove nonexisting module names.

Change-Id: I825de45f1b982e4aa391b11bf18ba90432272fa7
---
 core/main.mk               | 2 +-
 target/product/embedded.mk | 1 -
 target/product/emulator.mk | 5 -----
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/core/main.mk b/core/main.mk
index f7849a242..812fd930a 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -643,7 +643,7 @@ ifdef is_sdk_build
   # 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 7f681b13f..083010111 100644
--- a/target/product/embedded.mk
+++ b/target/product/embedded.mk
@@ -50,7 +50,6 @@ PRODUCT_PACKAGES += \
     libstdc++ \
     libstlport \
     libsurfaceflinger \
-    libsurfaceflinger_client \
     libsurfaceflinger_ddmconnection \
     libsysutils \
     libthread_db \
diff --git a/target/product/emulator.mk b/target/product/emulator.mk
index 1dcdc604c..b0cc04ba2 100644
--- a/target/product/emulator.mk
+++ b/target/product/emulator.mk
@@ -37,11 +37,6 @@ PRODUCT_PACKAGES += \
 
 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 \