openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of git://android.git.kernel.org/platform/build into merge_korg_master 

Conflicts:
	core/apicheck_msg_current.txt
This commit is contained in:
Jean-Baptiste Queru 2009-07-06 12:27:36 -07:00
parent 9945bac303 6c8cafac16
commit 04edc95a32
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/apicheck_msg_current.txt
View File

@ -7,10 +7,10 @@ To make these errors go away, you have two choices:
errors above. errors above.
2) You can update current.xml by executing the following command: 2) You can update current.xml by executing the following command:
make update-api 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.
****************************** ******************************

8
core/main.mk
View File

@ -263,6 +263,14 @@ ifeq (,$(filter %:system/etc/apns-conf.xml, $(PRODUCT_COPY_FILES)))
$(warning implicitly installing apns-conf_sdk.xml) $(warning implicitly installing apns-conf_sdk.xml)
endif endif
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 # If we're on an eng or tests build, but not on the sdk, and we have
# a better one, use that instead. # a better one, use that instead.
ifneq ($(filter eng tests,$(TARGET_BUILD_VARIANT)),) ifneq ($(filter eng tests,$(TARGET_BUILD_VARIANT)),)

2
core/node_fns.mk
View File

@ -186,7 +186,9 @@ endef
define _import-node define _import-node
$(eval _include_stack := $(2) $$(_include_stack)) $(eval _include_stack := $(2) $$(_include_stack))
$(call clear-var-list, $(3)) $(call clear-var-list, $(3))
$(eval LOCAL_PATH := $(patsubst %/,%,$(dir $(2))))
$(eval include $(2)) $(eval include $(2))
$(eval LOCAL_PATH :=)
$(call copy-var-list, $(1).$(2), $(3)) $(call copy-var-list, $(1).$(2), $(3))
$(call clear-var-list, $(3)) $(call clear-var-list, $(3))

2
tools/findleaves.sh
View File

@ -86,7 +86,7 @@ filename="${!nargs}"
# Print out all files that match, as long as the path isn't explicitly # Print out all files that match, as long as the path isn't explicitly
# pruned. This will print out extraneous results from directories whose # pruned. This will print out extraneous results from directories whose
# parents have a match. These are filtered out by the awk script below. # 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. # Only pass along the directory of each match.
sed -e 's/\/[^\/]*$/\//' | sed -e 's/\/[^\/]*$/\//' |