commit f4535b257f6ca60545b50952886c3d1e35a339f0
author Colin Cross <ccross@android.com> Mon Jul 14 23:09:48 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 14 18:37:56 2014 +0000
tree e0888c9def366bf646aa89144ced1109cda460d4
parent 4d7769aea21c116a68725e6888c140677470c35c
parent 8179d4dcf658f195aa21040b88cc0e70e66cdcd5

Merge "HACK: use CPU_ABI hack only for arm64" into lmp-dev

core/pathmap.mk

diff --git a/core/pathmap.mk b/core/pathmap.mk
index 7b09f9a..a4a60fa 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -107,6 +107,7 @@
 #
 FRAMEWORKS_SUPPORT_SUBDIRS := \
         annotations \
+        media/protocols \
         v4 \
         v7/gridlayout \
         v7/appcompat \

target/product/generic_no_telephony.mk

diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index 3ee6de8..93c7563 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -29,7 +29,6 @@
     WallpaperCropper
 
 PRODUCT_PACKAGES += \
-    bcc \
     clatd \
     clatd.conf \
     pppd \