Merge "Add CarHome to the SDK." into froyo
diff --git a/core/Makefile b/core/Makefile
index fa62c25..0823995 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1195,10 +1195,12 @@
$(target_notice_file_txt) \
$(tools_notice_file_txt) \
$(OUT_DOCS)/offline-sdk-timestamp \
+ $(SYMBOLS_ZIP) \
$(INSTALLED_SYSTEMIMAGE) \
$(INSTALLED_USERDATAIMAGE_TARGET) \
$(INSTALLED_RAMDISK_TARGET) \
$(INSTALLED_SDK_BUILD_PROP_TARGET) \
+ $(INSTALLED_BUILD_PROP_TARGET) \
$(ATREE_FILES) \
$(atree_dir)/sdk.atree \
$(HOST_OUT_EXECUTABLES)/atree \
diff --git a/core/config.mk b/core/config.mk
index 64a5dd0..3eddc13 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -3,10 +3,16 @@
# current configuration and platform, which
# are not specific to what is being built.
+# Only use ANDROID_BUILD_SHELL to wrap around bash.
+# DO NOT use other shells such as zsh.
+ifdef ANDROID_BUILD_SHELL
+SHELL := $(ANDROID_BUILD_SHELL)
+else
# Use bash, not whatever shell somebody has installed as /bin/sh
# This is repeated from main.mk, since envsetup.sh runs this file
# directly.
SHELL := /bin/bash
+endif
# Tell python not to spam the source tree with .pyc files. This
# only has an effect on python 2.6 and above.
@@ -325,6 +331,3 @@
INTERNAL_PLATFORM_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/public_api.xml
-
-
-
diff --git a/core/main.mk b/core/main.mk
index b1a5bff..7553ede 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1,8 +1,13 @@
-
+# Only use ANDROID_BUILD_SHELL to wrap around bash.
+# DO NOT use other shells such as zsh.
+ifdef ANDROID_BUILD_SHELL
+SHELL := $(ANDROID_BUILD_SHELL)
+else
# Use bash, not whatever shell somebody has installed as /bin/sh
# This is repeated in config.mk, since envsetup.sh runs that file
# directly.
SHELL := /bin/bash
+endif
# this turns off the suffix rules built into make
.SUFFIXES:
@@ -709,7 +714,10 @@
.PHONY: sdk
ALL_SDK_TARGETS := $(INTERNAL_SDK_TARGET)
sdk: $(ALL_SDK_TARGETS)
-$(call dist-for-goals,sdk,$(ALL_SDK_TARGETS))
+$(call dist-for-goals,sdk, \
+ $(ALL_SDK_TARGETS) \
+ $(SYMBOLS_ZIP) \
+ )
.PHONY: findbugs
findbugs: $(INTERNAL_FINDBUGS_HTML_TARGET) $(INTERNAL_FINDBUGS_XML_TARGET)