Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."

2014-04-15 23:32:42 +00:00
parent 695d8f6956 e948255ac6
commit 0ac89b4595
4 changed files with 3 additions and 3 deletions
--- 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

--- 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 \
--- 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 \
--- 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 \