summaryrefslogtreecommitdiffstats
path: root/target/product/base.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-04-25 09:28:00 -0700
committerYing Wang <wangying@google.com>2014-04-25 09:28:00 -0700
commit8d4562a14da90789f39579e1133a707003b60c0c (patch)
tree5d766b1932517f7e4478fb17f99259f0b392b9fc /target/product/base.mk
parent6ee3c4327d706c6bb0c0875f3094ab43bf96a7fd (diff)
parent0a694f4c57a20e00d2939c043fac78acdcb7479d (diff)
downloadbuild-8d4562a14da90789f39579e1133a707003b60c0c.zip
build-8d4562a14da90789f39579e1133a707003b60c0c.tar.gz
build-8d4562a14da90789f39579e1133a707003b60c0c.tar.bz2
resolved conflicts for merge of 0a694f4c to master
Change-Id: Idec6e6837c6329dae423a12fc084a11bca82463d
Diffstat (limited to 'target/product/base.mk')
-rw-r--r--target/product/base.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/target/product/base.mk b/target/product/base.mk
index 759313e..45dd9a7 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -52,7 +52,6 @@ PRODUCT_PACKAGES += \
libinput \
libinputflinger \
libiprouteutil \
- libjni_latinime \
libjnigraphics \
libldnhncr \
libmedia \
@@ -61,7 +60,6 @@ PRODUCT_PACKAGES += \
libmtp \
libnetlink \
libnetutils \
- libpac \
libreference-ril \
libreverbwrapper \
libril \