merge in jb-mr2-release history after reset to jb-mr2-dev
diff --git a/core/build_id.mk b/core/build_id.mk
index d588105..ffff91e 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -1,4 +1,3 @@
-
#
# Copyright (C) 2008 The Android Open Source Project
#
@@ -14,9 +13,20 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+
+#
+# Defines branch-specific values.
+#
+
# BUILD_ID is usually used to specify the branch name
# (like "MAIN") or a branch name and a release candidate
-# (like "CRB01"). It must be a single word, and is
+# (like "TC1-RC5"). It must be a single word, and is
# capitalized by convention.
+#
+BUILD_ID := JB_MR2
-export BUILD_ID=JWR60E
+# DISPLAY_BUILD_NUMBER should only be set for development branches,
+# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for
+# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY
+# is the same as BUILD_ID
+DISPLAY_BUILD_NUMBER := true
diff --git a/core/pathmap.mk b/core/pathmap.mk
index b76e0ed..09f912e 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -111,11 +111,12 @@
# A list of all source roots under frameworks/support.
#
FRAMEWORKS_SUPPORT_SUBDIRS := \
- v4 \
- v7/gridlayout \
- v7/appcompat \
- v7/mediarouter \
- v13
+ v4 \
+ v7/gridlayout \
+ v7/appcompat \
+ v7/mediarouter \
+ v8/renderscript \
+ v13
#
# A version of FRAMEWORKS_SUPPORT_SUBDIRS that is expanded to full paths from