am d054f1f7: am 7ffd7c20: am df5c798f: Merge "[MIPS] Temporarily disable Mips shared-textrel errors"
* commit 'd054f1f7477d4abaa3a15b4398bf6e3e0b52fe34':
[MIPS] Temporarily disable Mips shared-textrel errors
diff --git a/CleanSpec.mk b/CleanSpec.mk
index bfb27d9..74e7c43 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -354,11 +354,6 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop)
-# Change PLATFORM_VERSION from MNC to M
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)
-
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************
diff --git a/core/config.mk b/core/config.mk
index 5ad79e3..ca30962 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -455,7 +455,7 @@
# Turn off jack warnings by default.
DEFAULT_JACK_EXTRA_ARGS += --verbose error
-JILL := java -Xmx3500m -jar $(JILL_JAR)
+JILL := java -jar $(JILL_JAR)
PROGUARD := external/proguard/bin/proguard.sh
JAVATAGS := build/tools/java-event-log-tags.py
LLVM_RS_CC := $(HOST_OUT_EXECUTABLES)/llvm-rs-cc$(HOST_EXECUTABLE_SUFFIX)
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index d325fd3..c36d690 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -41,7 +41,7 @@
# which is the version that we reveal to the end user.
# Update this value when the platform version changes (rather
# than overriding it somewhere else). Can be an arbitrary string.
- PLATFORM_VERSION := M
+ PLATFORM_VERSION := MNC
endif
ifeq "" "$(PLATFORM_SDK_VERSION)"
diff --git a/target/product/base.mk b/target/product/base.mk
index 509336f..f738fe5 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