Merge "Fix userdata partition's ext4 mount point to data." into gingerbread
diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk
index 0a796f0..f697347 100644
--- a/core/tasks/cts.mk
+++ b/core/tasks/cts.mk
@@ -25,6 +25,7 @@
endif
CTS_HOST_JAR := $(HOST_OUT_JAVA_LIBRARIES)/cts.jar
+DDMLIB_JAR := $(HOST_OUT_JAVA_LIBRARIES)/ddmlib-prebuilt.jar
junit_host_jar := $(HOST_OUT_JAVA_LIBRARIES)/junit.jar
HOSTTESTLIB_JAR := $(HOST_OUT_JAVA_LIBRARIES)/hosttestlib.jar
@@ -55,6 +56,8 @@
# Copy executable to CTS directory
$(hide) $(ACP) -fp $(CTS_HOST_JAR) $(PRIVATE_DIR)/tools
$(hide) $(ACP) -fp $(CTS_EXECUTABLE_PATH) $(PRIVATE_DIR)/tools
+# Copy ddmlib prebuilt jar
+ $(hide) $(ACP) -fp $(DDMLIB_JAR) $(PRIVATE_DIR)/tools
# Copy junit jar
$(hide) $(ACP) -fp $(PRIVATE_JUNIT_HOST_JAR) $(PRIVATE_DIR)/tools
# Copy hosttestlib jar
diff --git a/target/product/core.mk b/target/product/core.mk
index e68d04b..7f753b4 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -54,7 +54,6 @@
libz \
sqlite-jdbc \
Browser \
- CarHomeLauncher \
Contacts \
Home \
HTMLViewer \
diff --git a/target/product/generic.mk b/target/product/generic.mk
index 1f26a75..eed354a 100644
--- a/target/product/generic.mk
+++ b/target/product/generic.mk
@@ -19,7 +19,6 @@
PRODUCT_PACKAGES := \
AccountAndSyncSettings \
- CarHome \
DeskClock \
AlarmProvider \
Bluetooth \
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 909a2fc..0de801d 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -20,7 +20,6 @@
AccountAndSyncSettings \
Camera \
Calculator \
- CarHome \
DeskClock \
Development \
DrmProvider \