Merge branch 'master' of git://android.git.kernel.org/platform/build into merge_korg_master
Conflicts:
core/apicheck_msg_current.txt
diff --git a/core/apicheck_msg_current.txt b/core/apicheck_msg_current.txt
index d723a19..5d3a913 100644
--- a/core/apicheck_msg_current.txt
+++ b/core/apicheck_msg_current.txt
@@ -7,10 +7,10 @@
errors above.
2) You can update current.xml by executing the following command:
-
make update-api
- To check in the revised current.xml, you will need approval from the android API council.
+ To submit the revised current.xml to the main Android repository,
+ you will need approval.
******************************
diff --git a/core/main.mk b/core/main.mk
index df1b906..aa7fcdb 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -263,6 +263,14 @@
$(warning implicitly installing apns-conf_sdk.xml)
endif
endif
+# Install a vold.conf file is one's not already being installed.
+ifeq (,$(filter %:system/etc/vold.conf, $(PRODUCT_COPY_FILES)))
+ PRODUCT_COPY_FILES += \
+ development/data/etc/vold.conf:system/etc/vold.conf
+ ifeq ($(filter eng tests,$(TARGET_BUILD_VARIANT)),)
+ $(warning implicitly installing vold.conf)
+ endif
+endif
# If we're on an eng or tests build, but not on the sdk, and we have
# a better one, use that instead.
ifneq ($(filter eng tests,$(TARGET_BUILD_VARIANT)),)
diff --git a/core/node_fns.mk b/core/node_fns.mk
index 8b026f5..5d2a669 100644
--- a/core/node_fns.mk
+++ b/core/node_fns.mk
@@ -186,7 +186,9 @@
define _import-node
$(eval _include_stack := $(2) $$(_include_stack))
$(call clear-var-list, $(3))
+ $(eval LOCAL_PATH := $(patsubst %/,%,$(dir $(2))))
$(eval include $(2))
+ $(eval LOCAL_PATH :=)
$(call copy-var-list, $(1).$(2), $(3))
$(call clear-var-list, $(3))
diff --git a/tools/findleaves.sh b/tools/findleaves.sh
index dafa1d8..74bfd24 100755
--- a/tools/findleaves.sh
+++ b/tools/findleaves.sh
@@ -86,7 +86,7 @@
# Print out all files that match, as long as the path isn't explicitly
# pruned. This will print out extraneous results from directories whose
# parents have a match. These are filtered out by the awk script below.
-find -L "${@:1:$nargs-1}" $findargs -type f -name "$filename" -print |
+find -L "${@:1:$nargs-1}" $findargs -type f -name "$filename" -print 2>/dev/null |
# Only pass along the directory of each match.
sed -e 's/\/[^\/]*$/\//' |