StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use new aapt feature to add default version info to .apks.

Browse Source
This commit is contained in:
Dianne Hackborn
2009-05-15 18:01:20 -07:00
parent eefd0212f1
commit 9bd5404a9d
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/definitions.mk
View File

@@ -1122,7 +1122,11 @@ $(hide) $(AAPT) package $(PRIVATE_AAPT_FLAGS) -m -z \
$(addprefix -P , $(PRIVATE_RESOURCE_PUBLICS_OUTPUT)) \ $(addprefix -P , $(PRIVATE_RESOURCE_PUBLICS_OUTPUT)) \
$(addprefix -S , $(PRIVATE_RESOURCE_DIR)) \ $(addprefix -S , $(PRIVATE_RESOURCE_DIR)) \
$(addprefix -A , $(PRIVATE_ASSET_DIR)) \ $(addprefix -A , $(PRIVATE_ASSET_DIR)) \
$(addprefix -I , $(PRIVATE_AAPT_INCLUDES)) $(addprefix -I , $(PRIVATE_AAPT_INCLUDES)) \
$(addprefix --min-sdk-version , $(DEFAULT_APP_TARGET_SDK)) \
$(addprefix --target-sdk-version , $(DEFAULT_APP_TARGET_SDK)) \
$(addprefix --version-code , $(PLATFORM_SDK_VERSION)) \
$(addprefix --version-name , $(PLATFORM_VERSION))
endef endef
ifeq ($(HOST_OS),windows) ifeq ($(HOST_OS),windows)
@@ -1250,6 +1254,9 @@ endef
# A list of dynamic and static parameters; build layers for # A list of dynamic and static parameters; build layers for
# dynamic params that lay over the static ones. # dynamic params that lay over the static ones.
#TODO: update the manifest to point to the package file #TODO: update the manifest to point to the package file
#Note that the version numbers are given to aapt as simple default
#values; applications can override these by explicitly stating
#them in their manifest.
define add-assets-to-package define add-assets-to-package
$(hide) $(AAPT) package -z -u $(PRIVATE_AAPT_FLAGS) \ $(hide) $(AAPT) package -z -u $(PRIVATE_AAPT_FLAGS) \
$(addprefix -c , $(PRODUCT_AAPT_CONFIG)) \ $(addprefix -c , $(PRODUCT_AAPT_CONFIG)) \
@@ -1257,6 +1264,10 @@ $(hide) $(AAPT) package -z -u $(PRIVATE_AAPT_FLAGS) \
$(addprefix -S , $(PRIVATE_RESOURCE_DIR)) \ $(addprefix -S , $(PRIVATE_RESOURCE_DIR)) \
$(addprefix -A , $(PRIVATE_ASSET_DIR)) \ $(addprefix -A , $(PRIVATE_ASSET_DIR)) \
$(addprefix -I , $(PRIVATE_AAPT_INCLUDES)) \ $(addprefix -I , $(PRIVATE_AAPT_INCLUDES)) \
$(addprefix --min-sdk-version , $(DEFAULT_APP_TARGET_SDK)) \
$(addprefix --target-sdk-version , $(DEFAULT_APP_TARGET_SDK)) \
$(addprefix --version-code , $(PLATFORM_SDK_VERSION)) \
$(addprefix --version-name , $(PLATFORM_VERSION)) \
-F $@ -F $@
endef endef

19
core/version_defaults.mk
View File

@@ -20,6 +20,8 @@
# Guarantees that the following are defined: # Guarantees that the following are defined:
# PLATFORM_VERSION # PLATFORM_VERSION
# PLATFORM_SDK_VERSION # PLATFORM_SDK_VERSION
# PLATFORM_VERSION_CODENAME
# DEFAULT_APP_TARGET_SDK
# BUILD_ID # BUILD_ID
# BUILD_NUMBER # BUILD_NUMBER
# #
@@ -55,11 +57,24 @@ ifeq "" "$(PLATFORM_SDK_VERSION)"
endif endif
ifeq "" "$(PLATFORM_VERSION_CODENAME)" ifeq "" "$(PLATFORM_VERSION_CODENAME)"
# This is the current development code-name, if the build is not a final # If the build is not a final release build, then this is the current
# release build. If this is a final release build, it is simply "REL". # development code-name. If this is a final release build, it is simply "REL".
PLATFORM_VERSION_CODENAME := Donut PLATFORM_VERSION_CODENAME := Donut
endif endif
ifeq "" "$(DEFAULT_APP_TARGET_SDK)"
# This is the default minSdkVersion and targetSdkVersion to use for
# all .apks created by the build system. It can be overridden by explicitly
# setting these in the .apk's AndroidManifest.xml. It is either the code
# name of the development build or, if this is a release build, the official
# SDK version of this release.
ifeq "REL" "$(PLATFORM_VERSION_CODENAME)"
DEFAULT_APP_TARGET_SDK := $(PLATFORM_SDK_VERSION)
else
DEFAULT_APP_TARGET_SDK := $(PLATFORM_VERSION_CODENAME)
endif
endif
ifeq "" "$(BUILD_ID)" ifeq "" "$(BUILD_ID)"
# Used to signify special builds. E.g., branches and/or releases, # Used to signify special builds. E.g., branches and/or releases,
# like "M5-RC7". Can be an arbitrary string, but must be a single # like "M5-RC7". Can be an arbitrary string, but must be a single