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

Commit 5c41c178 authored by Joe Onorato's avatar Joe Onorato Committed by Android Git Automerger
Browse files

am 700b88e1: Pass device characteristic information through to aapt. 

Merge commit '700b88e1' into gingerbread-plus-aosp

* commit '700b88e1':
  Pass device characteristic information through to aapt.
parents 222a835d 700b88e1

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libstagefright 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/vendor)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/android-info.txt)

$(call add-clean-step, find $(PRODUCT_OUT) -name "*.apk" | xargs rm)



# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

core/definitions.mk

+1 −0
Original line number Diff line number Diff line
@@ -1365,6 +1365,7 @@ $(hide) $(AAPT) package -u $(PRIVATE_AAPT_FLAGS) \ 
    $(addprefix -I , $(PRIVATE_AAPT_INCLUDES)) \

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

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

    $(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))) \

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

core/product.mk

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ _product_var_list := \ 
    PRODUCT_MANUFACTURER \

    PRODUCT_BRAND \

    PRODUCT_PROPERTY_OVERRIDES \

    PRODUCT_CHARACTERISTICS \

    PRODUCT_COPY_FILES \

    PRODUCT_OTA_PUBLIC_KEYS \

    PRODUCT_PACKAGE_OVERLAYS \

core/product_config.mk

+6 −0
Original line number Diff line number Diff line
@@ -253,6 +253,12 @@ ifndef PRODUCT_MANUFACTURER 
  PRODUCT_MANUFACTURER := unknown

endif



ifeq ($(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_CHARACTERISTICS),)

  TARGET_AAPT_CHARACTERISTICS := default

else

  TARGET_AAPT_CHARACTERISTICS := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_CHARACTERISTICS))

endif



PRODUCT_DEFAULT_WIFI_CHANNELS := \

	$(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEFAULT_WIFI_CHANNELS))