Merge "Add LLVM_AS to tools." into jb-dev
diff --git a/core/config.mk b/core/config.mk
index 620739f..3c267d9 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/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 5abdd55..a5d941e 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -42,6 +42,7 @@
SdkSetup \
CustomLocale \
sqlite3 \
+ InputDevices \
LatinIME \
CertInstaller \
LiveWallpapersPicker \