p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Remove the hacks needed to support ash and mksh concurrently."

This commit is contained in:
Elliott Hughes 2013-11-07 16:07:31 +00:00 committed by Gerrit Code Review
parent 240cd127eb 32bfd70333
commit a05365cece
5 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/base_rules.mk
View File

@ -75,7 +75,7 @@ endif
# Only the tags mentioned in this test are expected to be set by module # Only the tags mentioned in this test are expected to be set by module
# makefiles. Anything else is either a typo or a source of unexpected # makefiles. Anything else is either a typo or a source of unexpected
# behaviors. # behaviors.
ifneq ($(filter-out debug eng tests optional samples shell_mksh,$(LOCAL_MODULE_TAGS)),) ifneq ($(filter-out debug eng tests optional samples,$(LOCAL_MODULE_TAGS)),)
$(warning unusual tags $(LOCAL_MODULE_TAGS) on $(LOCAL_MODULE) at $(LOCAL_PATH)) $(warning unusual tags $(LOCAL_MODULE_TAGS) on $(LOCAL_MODULE) at $(LOCAL_PATH))
endif endif

6
core/build-system.html
View File

@ -247,7 +247,6 @@ for these).
for <code>eng</code>. for <code>eng</code>.
<ul> <ul>
<li>Installs modules tagged with: <code>eng</code>, <code>debug</code>, <li>Installs modules tagged with: <code>eng</code>, <code>debug</code>,
<code>shell_</code>$(TARGET_SHELL),
<code>user</code>, and/or <code>development</code>. <code>user</code>, and/or <code>development</code>.
<li>Installs non-APK modules that have no tags specified. <li>Installs non-APK modules that have no tags specified.
<li>Installs APKs according to the product definition files, in <li>Installs APKs according to the product definition files, in
@ -267,7 +266,7 @@ for these).
<p> <p>
This is the flavor intended to be the final release bits. This is the flavor intended to be the final release bits.
<ul> <ul>
<li>Installs modules tagged with <code>shell_</code>$(TARGET_SHELL) and <code>user</code>. <li>Installs modules tagged with <code>user</code>.
<li>Installs non-APK modules that have no tags specified. <li>Installs non-APK modules that have no tags specified.
<li>Installs APKs according to the product definition files; tags <li>Installs APKs according to the product definition files; tags
are ignored for APK modules. are ignored for APK modules.
@ -674,8 +673,7 @@ up.</p>
<h4>LOCAL_MODULE_TAGS</h4> <h4>LOCAL_MODULE_TAGS</h4>
<p>Set <code>LOCAL_MODULE_TAGS</code> to any number of whitespace-separated <p>Set <code>LOCAL_MODULE_TAGS</code> to any number of whitespace-separated
tags. If the tag list is empty or contains <code>droid</code>, the module tags. If the tag list is empty or contains <code>droid</code>, the module
will get installed as part of a <code>make droid</code>. Modules with the tag will get installed as part of a <code>make droid</code>. Otherwise, it will
<code>shell_</code>$(TARGET_SHELL) will also be installed. Otherwise, it will
only get installed by running <code>make &lt;your-module&gt;</code> only get installed by running <code>make &lt;your-module&gt;</code>
or with the <code>make all</code> pseudotarget.</p> or with the <code>make all</code> pseudotarget.</p>

3
core/config.mk
View File

@ -114,9 +114,6 @@ TARGET_ERROR_FLAGS := -Werror=return-type -Werror=non-virtual-dtor -Werror=addre
# TODO: do symbol compression # TODO: do symbol compression
TARGET_COMPRESS_MODULE_SYMBOLS := false TARGET_COMPRESS_MODULE_SYMBOLS := false
# Default shell is mksh. Other possible value is ash.
TARGET_SHELL := mksh
# ############################################################### # ###############################################################
# Include sub-configuration files # Include sub-configuration files
# ############################################################### # ###############################################################

2
core/main.mk
View File

@ -622,12 +622,10 @@ tests_MODULES := $(sort \
# TODO: Remove the 3 places in the tree that use ALL_DEFAULT_INSTALLED_MODULES # TODO: Remove the 3 places in the tree that use ALL_DEFAULT_INSTALLED_MODULES
# and get rid of it from this list. # and get rid of it from this list.
# TODO: The shell is chosen by magic. Do we still need this?
modules_to_install := $(sort \ modules_to_install := $(sort \
$(ALL_DEFAULT_INSTALLED_MODULES) \ $(ALL_DEFAULT_INSTALLED_MODULES) \
$(product_FILES) \ $(product_FILES) \
$(foreach tag,$(tags_to_install),$($(tag)_MODULES)) \ $(foreach tag,$(tags_to_install),$($(tag)_MODULES)) \
$(call get-tagged-modules, shell_$(TARGET_SHELL)) \
$(CUSTOM_MODULES) \ $(CUSTOM_MODULES) \
) )

2
target/product/embedded.mk
View File

@ -58,8 +58,10 @@ PRODUCT_PACKAGES += \
linker \ linker \
logcat \ logcat \
logwrapper \ logwrapper \
mkshrc \
service \ service \
servicemanager \ servicemanager \
sh \
surfaceflinger \ surfaceflinger \
toolbox toolbox