Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aecadc06 authored by Ying Wang's avatar Ying Wang Committed by Android (Google) Code Review
Browse files

Merge "Don't add build number to apps' version name for platform build." into mnc-dr-dev

parents 1b5eef1b b79e8771

core/definitions.mk

+10 −6
Original line number Diff line number Diff line
@@ -1633,8 +1633,12 @@ endef 
## Commands for running javac to make .class files

###########################################################



#@echo "Source intermediates dir: $(PRIVATE_SOURCE_INTERMEDIATES_DIR)"

#@echo "Source intermediates: $$(find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) -name '*.java')"

# Add BUILD_NUMBER to apps default version name if it's unbundled build.

ifdef TARGET_BUILD_APPS

APPS_DEFAULT_VERSION_NAME := $(PLATFORM_VERSION)-$(BUILD_NUMBER)

else

APPS_DEFAULT_VERSION_NAME := $(PLATFORM_VERSION)

endif



# TODO: Right now we generate the asset resources twice, first as part

# of generating the Java classes, then at the end when packaging the final
@@ -1661,8 +1665,8 @@ $(hide) $(AAPT) package $(PRIVATE_AAPT_FLAGS) -m \ 
    $(addprefix -G , $(PRIVATE_PROGUARD_OPTIONS_FILE)) \

    $(addprefix --min-sdk-version , $(PRIVATE_DEFAULT_APP_TARGET_SDK)) \

    $(addprefix --target-sdk-version , $(PRIVATE_DEFAULT_APP_TARGET_SDK)) \

    $(if $(filter --version-code,$(PRIVATE_AAPT_FLAGS)),,$(addprefix --version-code , $(PLATFORM_SDK_VERSION))) \

    $(if $(filter --version-name,$(PRIVATE_AAPT_FLAGS)),,$(addprefix --version-name , $(PLATFORM_VERSION)-$(BUILD_NUMBER))) \

    $(if $(filter --version-code,$(PRIVATE_AAPT_FLAGS)),,--version-code $(PLATFORM_SDK_VERSION)) \

    $(if $(filter --version-name,$(PRIVATE_AAPT_FLAGS)),,--version-name $(APPS_DEFAULT_VERSION_NAME)) \

    $(addprefix --rename-manifest-package , $(PRIVATE_MANIFEST_PACKAGE_NAME)) \

    $(addprefix --rename-instrumentation-target-package , $(PRIVATE_MANIFEST_INSTRUMENTATION_FOR)) \

    --skip-symbols-without-default-localization
@@ -2010,8 +2014,8 @@ $(hide) $(AAPT) package -u $(PRIVATE_AAPT_FLAGS) \ 
    $(addprefix --min-sdk-version , $(PRIVATE_DEFAULT_APP_TARGET_SDK)) \

    $(addprefix --target-sdk-version , $(PRIVATE_DEFAULT_APP_TARGET_SDK)) \

    $(if $(filter --product,$(PRIVATE_AAPT_FLAGS)),,$(addprefix --product , $(TARGET_AAPT_CHARACTERISTICS))) \

    $(if $(filter --version-code,$(PRIVATE_AAPT_FLAGS)),,$(addprefix --version-code , $(PLATFORM_SDK_VERSION))) \

    $(if $(filter --version-name,$(PRIVATE_AAPT_FLAGS)),,$(addprefix --version-name , $(PLATFORM_VERSION)-$(BUILD_NUMBER))) \

    $(if $(filter --version-code,$(PRIVATE_AAPT_FLAGS)),,--version-code $(PLATFORM_SDK_VERSION)) \

    $(if $(filter --version-name,$(PRIVATE_AAPT_FLAGS)),,--version-name $(APPS_DEFAULT_VERSION_NAME)) \

    $(addprefix --rename-manifest-package , $(PRIVATE_MANIFEST_PACKAGE_NAME)) \

    $(addprefix --rename-instrumentation-target-package , $(PRIVATE_MANIFEST_INSTRUMENTATION_FOR)) \

    --skip-symbols-without-default-localization \