am d503fa85: Reconcile with jb-mr2-release - do not merge
* commit 'd503fa85deaf4c14d27f45c1408ed13f302f36f4':
"JWR03"
JWR02B
"JWR02"
diff --git a/CleanSpec.mk b/CleanSpec.mk
index a55b241..4d9313a 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -168,6 +168,11 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)
+# And on to KLP...
+$(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/version_defaults.mk b/core/version_defaults.mk
index ceb550f..24c8c49 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 := JellyBeanMR2
+ PLATFORM_VERSION := KeyLimePie
endif
ifeq "" "$(PLATFORM_SDK_VERSION)"
@@ -59,7 +59,7 @@
ifeq "" "$(PLATFORM_VERSION_CODENAME)"
# This is the current development code-name, if the build is not a final
# release build. If this is a final release build, it is simply "REL".
- PLATFORM_VERSION_CODENAME := JellyBeanMR2
+ PLATFORM_VERSION_CODENAME := KeyLimePie
endif
ifeq "" "$(DEFAULT_APP_TARGET_SDK)"
diff --git a/target/product/embedded.mk b/target/product/embedded.mk
index 0830101..15331a9 100644
--- a/target/product/embedded.mk
+++ b/target/product/embedded.mk
@@ -58,6 +58,7 @@
linker \
logcat \
logwrapper \
+ reboot \
service \
servicemanager \
surfaceflinger \
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index 194fb7a..d58d234 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -31,6 +31,7 @@
FusedLocation \
Gallery2 \
InputDevices \
+ Keyguard \
LatinIME \
Launcher2 \
Music \
@@ -41,6 +42,7 @@
QuickSearchBox \
Settings \
SystemUI \
+ Terminal \
CalendarProvider \
bluetooth-health \
hostapd \
diff --git a/target/product/mini.mk b/target/product/mini.mk
index 16a2b8f..1d4b74e 100644
--- a/target/product/mini.mk
+++ b/target/product/mini.mk
@@ -221,6 +221,7 @@
PRODUCT_PACKAGES += \
TestingCamera \
Home \
+ Keyguard \
SystemUI \
Settings \
libsurfaceflinger_ddmconnection
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 51b90f5..bde6636 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -24,6 +24,7 @@
Exchange2 \
FusedLocation \
Gallery \
+ Keyguard \
Music \
Mms \
OpenWnn \
