am c6e08c81: am 95e74c14: common.py: Add support for squashfs
* commit 'c6e08c816bd85b47243779a280bc574afbf3b556':
common.py: Add support for squashfs
diff --git a/core/pathmap.mk b/core/pathmap.mk
index 446c82c..cbf392d 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -113,7 +113,6 @@
v7/cardview \
v7/mediarouter \
v7/palette \
- v7/recyclerview \
v8/renderscript \
v13 \
v17/leanback \
@@ -132,13 +131,15 @@
#
FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS := \
$(addprefix frameworks/support/,$(FRAMEWORKS_SUPPORT_SUBDIRS)) \
- $(addprefix frameworks/,$(FRAMEWORKS_MULTIDEX_SUBDIRS))
+ $(addprefix frameworks/,$(FRAMEWORKS_MULTIDEX_SUBDIRS)) \
+ frameworks/support/v7/recyclerview/src
#
# A list of support library modules.
#
FRAMEWORKS_SUPPORT_JAVA_LIBRARIES := \
$(foreach dir,$(FRAMEWORKS_SUPPORT_SUBDIRS),android-support-$(subst /,-,$(dir))) \
+ android-support-v7-recyclerview \
android-support-multidex \
android-support-multidex-instrumentation
diff --git a/target/product/base.mk b/target/product/base.mk
index 15f4c1a..60b48f7 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -38,6 +38,8 @@
fsck_msdos \
ime \
input \
+ inputflinger \
+ inputflingerhost \
javax.obex \
libandroid \
libandroid_runtime \
@@ -55,6 +57,7 @@
libeffects \
libinput \
libinputflinger \
+ libinputflingerhost \
libiprouteutil \
libjnigraphics \
libldnhncr \
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index f6ccd2a..e6ab4fe 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -48,7 +48,8 @@
audio_policy.default \
local_time.default \
vibrator.default \
- power.default
+ power.default \
+ input.evdev.default
PRODUCT_COPY_FILES := \
frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf