Merge "remove remaining refs to max_image_sizes" into gingerbread
diff --git a/core/user_tags.mk b/core/user_tags.mk
index f1eab9b..92eefab 100644
--- a/core/user_tags.mk
+++ b/core/user_tags.mk
@@ -61,7 +61,6 @@
bluetoothd \
bmgr \
bootanimation \
- bouncycastle \
brcm_patchram_plus \
bugreport \
cfassembler \
@@ -73,15 +72,11 @@
com.android.phone.common \
commons-compress-1.0 \
copybit.qsd8k \
- core \
- core-junit \
coverage \
cpufeatures \
- create_test_dmtrace \
cts \
CtsAppSecurityTests \
cts-dalvik-buildutil \
- dalvikvm \
dasm \
dbus-daemon \
ddmlib \
@@ -89,17 +84,12 @@
ddmuilib \
debuggerd \
descGen \
- dexdeps \
- dexdump \
- dexlist \
- dexopt \
dexpreopt \
dex-tools \
dhcpcd \
dhcpcd.conf \
dhcpcd-run-hooks \
dictTest \
- dmtracedump \
dnsmasq \
draw9patch \
droiddoc \
@@ -108,8 +98,6 @@
dump_regions \
dumpstate \
dumpsys \
- dvz \
- dx \
dx-tests \
easymock \
edify \
@@ -125,7 +113,6 @@
etc1tool \
eventanalyzer \
exc_dump \
- ext \
fastboot \
framework \
FrameworkCoreHostTests \
@@ -147,7 +134,6 @@
hierarchyviewer \
hist_trace \
hosttestlib \
- hprof-conv \
icudata \
idegen \
ime \
@@ -159,8 +145,6 @@
iself \
isprelinked \
jarjar \
- jasmin \
- jasmin.jar \
javax.obex \
jcommon-1.0.12 \
jdiff \
@@ -208,17 +192,14 @@
libcamerastub \
libc_common \
libc_nomalloc \
- libcrypto \
libctest \
libcutils \
libdb \
libdbus \
- libdex \
libdiskconfig \
libdl \
libdrm1 \
libdrm1_jni \
- libdvm \
libebl \
libebl_arm \
libebl_sh \
@@ -231,7 +212,6 @@
libESR_Shared \
libETC1 \
libexif \
- libexpat \
libext \
libfdlibm \
libfdlibm-host \
@@ -248,12 +228,8 @@
libhardware \
libhardware_legacy \
libhost \
- libicui18n \
- libicuuc \
libiprouteutil \
libiptc \
- libjavacore \
- libjavacore-host \
libjnigraphics \
libjni_latinime \
libjni_pinyinime \
@@ -271,7 +247,6 @@
libminzip \
libmtdutils \
libmusicbundle \
- libnativehelper \
libneo_cgi \
libneo_cs \
libneo_util \
@@ -307,7 +282,6 @@
libspeex \
libsqlite \
libsqlite3_android \
- libsqlite_jni \
libSR_AcousticModels \
libSR_AcousticState \
libSR_AudioIn \
@@ -321,7 +295,6 @@
libSR_Semproc \
libSR_Session \
libSR_Vocabulary \
- libssl \
libstagefright \
libstagefright_aacdec \
libstagefright_aacenc \
@@ -376,7 +349,6 @@
libwpa_client \
libwrapsim \
libxml2 \
- libz \
libzipfile \
lights.kraken \
lights.qsd8k \
@@ -470,7 +442,6 @@
soslim \
spec-progress \
sqlite3 \
- sqlite-jdbc \
stack_dump \
stringtemplate \
surfaceflinger \
diff --git a/target/product/core.mk b/target/product/core.mk
index 8ee073a..6f93876 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -23,7 +23,36 @@
ro.config.alarm_alert=Alarm_Classic.ogg
PRODUCT_PACKAGES := \
+ bouncycastle \
+ core \
+ core-junit \
+ create_test_dmtrace \
+ dalvikvm \
+ dexdeps \
+ dexdump \
+ dexlist \
+ dexopt \
+ dmtracedump \
+ dvz \
+ dx \
+ ext \
framework-res \
+ hprof-conv \
+ icu.dat \
+ jasmin \
+ jasmin.jar \
+ libcrypto \
+ libdex \
+ libdvm \
+ libexpat \
+ libicui18n \
+ libicuuc \
+ libjavacore \
+ libnativehelper \
+ libsqlite_jni \
+ libssl \
+ libz \
+ sqlite-jdbc \
Browser \
CarHomeLauncher \
Contacts \
@@ -43,3 +72,20 @@
PackageInstaller \
DefaultContainerService \
Bugreport
+
+# force WITH_HOST_DALVIK on userdebug and user builds.
+# TODO: this is redundant with a similar clause in build/core/main.mk.
+ifneq (,$(filter userdebug user,$(TARGET_BUILD_VARIANT)))
+ ifeq ($(HOST_OS),linux)
+ WITH_HOST_DALVIK := true
+ endif
+endif
+
+# host-only dependencies
+ifeq ($(WITH_HOST_DALVIK),true)
+ PRODUCT_PACKAGES += \
+ bouncycastle-hostdex \
+ core-hostdex \
+ libjavacore-host
+endif
+