merge in mnc-dr-release history after reset to mnc-dr-dev
diff --git a/CleanSpec.mk b/CleanSpec.mk
index c95ae05..7778118 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -364,6 +364,11 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)
+# 23 is becoming more alive!!!
+$(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/build_id.mk b/core/build_id.mk
index cb275d5..0e8e2cf 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
# (like "CRB01"). It must be a single word, and is
# capitalized by convention.
-export BUILD_ID=MDA30H
+export BUILD_ID=MASTER
diff --git a/core/pathmap.mk b/core/pathmap.mk
index 59c9be2..4d9b069 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -117,7 +117,10 @@
v17/leanback \
design \
percent \
- recommendation
+ recommendation \
+ v7/preference \
+ v14/preference \
+ v17/preference-leanback
#
# A list of all source roots under frameworks/multidex.
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index c481bbc..e88623e 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 := 6.0
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 := MNC
+ PLATFORM_VERSION_CODENAME := REL
# This is all of the development codenames that are active. Should be either
# the same as PLATFORM_VERSION_CODENAME or a comma-separated list of additional
