From e948255ac6b807dc72e219312c3f7a06746bd57b Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Tue, 15 Apr 2014 14:42:27 -0700
Subject: [PATCH] Remove libGLES_android from non-emulator builds; Remove
 screenrecord from SDK build.

Bug: 11368415
Bug: 14087863
Change-Id: I05d406d174ea1d1bf67c7922c03950e700978baa
---
 target/product/core_base.mk            | 1 -
 target/product/embedded.mk             | 1 -
 target/product/emulator.mk             | 1 +
 target/product/generic_no_telephony.mk | 3 ++-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/target/product/core_base.mk b/target/product/core_base.mk
index 658e5025b..69bde633a 100644
--- a/target/product/core_base.mk
+++ b/target/product/core_base.mk
@@ -62,7 +62,6 @@ PRODUCT_PACKAGES += \
     mdnsd \
     mms-common \
     requestsync \
-    screenrecord \
     telephony-common \
     voip-common
 
diff --git a/target/product/embedded.mk b/target/product/embedded.mk
index 32d479caf..60a19da79 100644
--- a/target/product/embedded.mk
+++ b/target/product/embedded.mk
@@ -34,7 +34,6 @@ PRODUCT_PACKAGES += \
     libEGL \
     libETC1 \
     libFFTEm \
-    libGLES_android \
     libGLESv1_CM \
     libGLESv2 \
     libbinder \
diff --git a/target/product/emulator.mk b/target/product/emulator.mk
index 6812c221f..c094a9204 100644
--- a/target/product/emulator.mk
+++ b/target/product/emulator.mk
@@ -43,6 +43,7 @@ PRODUCT_PACKAGES += \
     libGLESv1_CM_emulation \
     lib_renderControl_enc \
     libEGL_emulation \
+    libGLES_android \
     libGLESv2_enc \
     libOpenglSystemCommon \
     libGLESv2_emulation \
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index 814426b54..12797f417 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -50,7 +50,8 @@ PRODUCT_PACKAGES += \
     bcc \
     clatd \
     clatd.conf \
-    pppd
+    pppd \
+    screenrecord
 
 PRODUCT_PACKAGES += \
     librs_jni \