merge in master-release history after reset to master
diff --git a/core/build_id.mk b/core/build_id.mk
index b6bfbc7..40bb35d 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 := MASTER
-export BUILD_ID=AAN39
+# 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/config.mk b/core/config.mk
index 883d6c0..3ba0771 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -303,7 +303,6 @@
DX := $(HOST_OUT_EXECUTABLES)/dx
ZIPALIGN := $(HOST_OUT_EXECUTABLES)/zipalign$(HOST_EXECUTABLE_SUFFIX)
FINDBUGS := prebuilt/common/findbugs/bin/findbugs
-LOCALIZE := $(HOST_OUT_EXECUTABLES)/localize$(HOST_EXECUTABLE_SUFFIX)
EMMA_JAR := external/emma/lib/emma$(COMMON_JAVA_PACKAGE_SUFFIX)
# Deal with archaic version of bison on Mac OS X.
diff --git a/core/llvm_config.mk b/core/llvm_config.mk
index 966924e..bc90b95 100644
--- a/core/llvm_config.mk
+++ b/core/llvm_config.mk
@@ -1,5 +1,6 @@
CLANG := $(HOST_OUT_EXECUTABLES)/clang$(HOST_EXECUTABLE_SUFFIX)
CLANG_CXX := $(HOST_OUT_EXECUTABLES)/clang++$(HOST_EXECUTABLE_SUFFIX)
+LLVM_AS := $(HOST_OUT_EXECUTABLES)/llvm-as$(HOST_EXECUTABLE_SUFFIX)
LLVM_LINK := $(HOST_OUT_EXECUTABLES)/llvm-link$(HOST_EXECUTABLE_SUFFIX)
define do-clang-flags-subst
diff --git a/target/product/core.mk b/target/product/core.mk
index 8170c2f..716f9f7 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -75,6 +75,7 @@
libaudiopreprocessing \
libaudioutils \
libcrypto \
+ libdownmix \
libdvm \
libdrmframework \
libdrmframework_jni \
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index 6135cc3..5863435 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -29,6 +29,7 @@
Email \
Exchange2 \
Gallery2 \
+ InputDevices \
LatinIME \
Launcher2 \
Music \
@@ -53,8 +54,7 @@
librs_jni \
libvideoeditor_jni \
libvideoeditorplayer \
- libvideoeditor_core \
- libdownmix
+ libvideoeditor_core
PRODUCT_PACKAGES += \
audio.primary.default \
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 62d4059..4707cb9 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -42,6 +42,7 @@
SdkSetup \
CustomLocale \
sqlite3 \
+ InputDevices \
LatinIME \
CertInstaller \
LiveWallpapersPicker \
