resolved conflicts for merge of d9de6588 to master

Change-Id: I3d7d6744b4f0d7c10bf001c87c0abbb4cb6885ef

core/user_tags.mk

@@ -65,7 +65,6 @@ GRANDFATHERED_USER_MODULES += \
 	bluetoothd \
 	bmgr \
 	bootanimation \
-	bouncycastle \
 	brcm_patchram_plus \
 	bugreport \
 	cfassembler \
@@ -78,15 +77,11 @@ GRANDFATHERED_USER_MODULES += \
 	commons-compress-1.0 \
 	copybit.qsd8k \
 	copybit.s5pc110 \
-	core \
-	core-junit \
 	coverage \
 	cpufeatures \
-	create_test_dmtrace \
 	cts \
 	CtsAppSecurityTests \
 	cts-dalvik-buildutil \
-	dalvikvm \
 	dasm \
 	dbus-daemon \
 	ddmlib \
@@ -96,18 +91,13 @@ GRANDFATHERED_USER_MODULES += \
 	ddmuilib \
 	debuggerd \
 	descGen \
-	dexdeps \
-	dexdump \
 	dexgen \
-	dexlist \
-	dexopt \
 	dexpreopt \
 	dex-tools \
 	dhcpcd \
 	dhcpcd.conf \
 	dhcpcd-run-hooks \
 	dictTest \
-	dmtracedump \
 	dnsmasq \
 	doclava \
 	draw9patch \
@@ -116,8 +106,6 @@ GRANDFATHERED_USER_MODULES += \
 	dump_regions \
 	dumpstate \
 	dumpsys \
-	dvz \
-	dx \
 	dx-tests \
 	e2fsck \
 	e2fsck_host \
@@ -137,7 +125,6 @@ GRANDFATHERED_USER_MODULES += \
 	etc1tool \
 	eventanalyzer \
 	exc_dump \
-	ext \
 	fastboot \
 	framework \
 	FrameworkCoreHostTests \
@@ -162,7 +149,6 @@ GRANDFATHERED_USER_MODULES += \
 	hierarchyviewerlib \
 	hist_trace \
 	hosttestlib \
-	hprof-conv \
 	icudata \
 	idegen \
 	ime \
@@ -175,8 +161,6 @@ GRANDFATHERED_USER_MODULES += \
 	iself \
 	isprelinked \
 	jarjar \
-	jasmin \
-	jasmin.jar \
 	javax.obex \
 	jcommon-1.0.12 \
 	jdiff \
@@ -234,18 +218,15 @@ GRANDFATHERED_USER_MODULES += \
 	libclangParse \
 	libclangSema \
 	libc_nomalloc \
-	libcrypto \
 	libctest \
 	libcutils \
 	libdb \
 	libdbus \
-	libdex \
 	libdiskconfig \
 	libdiskconfig_host \
 	libdl \
 	libdrm1 \
 	libdrm1_jni \
-	libdvm \
 	libebl \
 	libebl_arm \
 	libebl_sh \
@@ -258,7 +239,6 @@ GRANDFATHERED_USER_MODULES += \
 	libESR_Shared \
 	libETC1 \
 	libexif \
-	libexpat \
 	libext \
 	libext2_blkid \
 	libext2_blkid_host \
@@ -288,12 +268,8 @@ GRANDFATHERED_USER_MODULES += \
 	libhardware_legacy \
 	libhost \
 	libhyphenation \
-	libicui18n \
-	libicuuc \
 	libiprouteutil \
 	libiptc \
-	libjavacore \
-	libjavacore-host \
 	libjnigraphics \
 	libjni_latinime \
 	libjni_pinyinime \
@@ -342,7 +318,9 @@ GRANDFATHERED_USER_MODULES += \
 	libmtdutils \
 	libmtp \
 	libmusicbundle \
-	libnativehelper \
+	libneo_cgi \
+	libneo_cs \
+	libneo_util \
 	libnetlink \
 	libnetutils \
 	libop \
@@ -378,7 +356,6 @@ GRANDFATHERED_USER_MODULES += \
 	libspeex \
 	libsqlite \
 	libsqlite3_android \
-	libsqlite_jni \
 	libSR_AcousticModels \
 	libSR_AcousticState \
 	libSR_AudioIn \
@@ -392,7 +369,6 @@ GRANDFATHERED_USER_MODULES += \
 	libSR_Semproc \
 	libSR_Session \
 	libSR_Vocabulary \
-	libssl \
 	libstagefright \
 	libstagefright_aacdec \
 	libstagefright_aacenc \
@@ -450,7 +426,6 @@ GRANDFATHERED_USER_MODULES += \
 	libwrapsim \
 	libxml2 \
 	libxslt \
-	libz \
 	libzipfile \
 	lights.kraken \
 	lights.qsd8k \
@@ -555,7 +530,6 @@ GRANDFATHERED_USER_MODULES += \
 	soslim \
 	spec-progress \
 	sqlite3 \
-	sqlite-jdbc \
 	stack_dump \
 	stingray-keypad.kcm \
 	stringtemplate \

target/product/core.mk

@@ -23,7 +23,36 @@ PRODUCT_PROPERTY_OVERRIDES := \
     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,18 @@ PRODUCT_PACKAGES := \
     DefaultContainerService \
     Bugreport \
     ip
+
+# 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)))
+    WITH_HOST_DALVIK := true
+endif
+
+# host-only dependencies
+ifeq ($(WITH_HOST_DALVIK),true)
+    PRODUCT_PACKAGES += \
+        bouncycastle-hostdex \
+        core-hostdex \
+        libjavacore-host
+endif
+