Merge change 6444
* changes:
Revert "Ensure that /system/etc/vold.conf is created in the "generic" product."
diff --git a/core/combo/linux-x86.mk b/core/combo/linux-x86.mk
index 372c63e..f466147 100644
--- a/core/combo/linux-x86.mk
+++ b/core/combo/linux-x86.mk
@@ -10,7 +10,7 @@
ifeq ($(combo_target),HOST_)
# $(1): The file to check
define get-file-size
-stat --format "%s" "$(1)"
+stat --format "%s" "$(1)" | tr -d '\n'
endef
endif
diff --git a/core/config.mk b/core/config.mk
index 6b2f08d..6e11d6c 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -78,8 +78,8 @@
COMMON_GLOBAL_CFLAGS:= -DANDROID -fmessage-length=0 -W -Wall -Wno-unused
COMMON_RELEASE_CFLAGS:= -DNDEBUG -UDEBUG
-COMMON_GLOBAL_CPPFLAGS:=
-COMMON_RELEASE_CPPFLAGS:=
+COMMON_GLOBAL_CPPFLAGS:= -DANDROID -fmessage-length=0 -W -Wall -Wno-unused -Wnon-virtual-dtor
+COMMON_RELEASE_CPPFLAGS:= -DNDEBUG -UDEBUG
# Set the extensions used for various packages
COMMON_PACKAGE_SUFFIX := .zip
diff --git a/core/definitions.mk b/core/definitions.mk
index 3fb6ec0..1f7ee77 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1558,8 +1558,8 @@
# next whole flash block size.
define assert-max-file-size
$(if $(2), \
- size=$$(for i in $(1); do $(call get-file-size,$$i); done); \
- total=$$(( $$( echo "$$size" | tr '\n' + ; echo 0 ) )); \
+ size=$$(for i in $(1); do $(call get-file-size,$$i); echo +; done; echo 0); \
+ total=$$(( $$( echo "$$size" ) )); \
printname=$$(echo -n "$(1)" | tr " " +); \
echo "$$printname total size is $$total"; \
img_blocksize=$(call image-size-from-data-size,$(BOARD_FLASH_BLOCK_SIZE)); \
@@ -1570,8 +1570,7 @@
if [ "$$total" -gt "$$maxsize" ]; then \
echo "error: $$printname too large ($$total > [$(2) - $$reserve])"; \
false; \
- fi; \
- if [ "$$total" -gt $$((maxsize - 32768)) ]; then \
+ elif [ "$$total" -gt $$((maxsize - 32768)) ]; then \
echo "WARNING: $$printname approaching size limit ($$total now; limit $$maxsize)"; \
fi \
, \
diff --git a/target/product/core.mk b/target/product/core.mk
index 1825824..79372a1 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -9,7 +9,6 @@
PRODUCT_PACKAGES := \
framework-res \
Browser \
- Calculator \
Contacts \
Launcher \
HTMLViewer \
diff --git a/target/product/generic.mk b/target/product/generic.mk
index b9bc070..4189b0e 100644
--- a/target/product/generic.mk
+++ b/target/product/generic.mk
@@ -5,9 +5,11 @@
PRODUCT_PACKAGES := \
AlarmClock \
AlarmProvider \
+ Calculator \
Calendar \
Camera \
DrmProvider \
+ Email \
LatinIME \
Mms \
Music \