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

Commit d172b350 authored by Ulyana Trafimovich's avatar Ulyana Trafimovich Committed by Gerrit Code Review
Browse files

Merge "Add PRODUCT_BOOT_JARS_EXTRA interface"

parents 1973f86f 012118da

core/product.mk

+6 −0
Original line number Diff line number Diff line
@@ -216,6 +216,12 @@ _product_list_vars += PRODUCT_VENDOR_KERNEL_HEADERS 


# A list of module names of BOOTCLASSPATH (jar files)

_product_list_vars += PRODUCT_BOOT_JARS



# A list of extra BOOTCLASSPATH jars (to be appended after common jars).

# Products that include device-specific makefiles before AOSP makefiles should use this

# instead of PRODUCT_BOOT_JARS, so that device-specific jars go after common jars.

_product_list_vars += PRODUCT_BOOT_JARS_EXTRA



_product_list_vars += PRODUCT_SUPPORTS_BOOT_SIGNER

_product_list_vars += PRODUCT_SUPPORTS_VBOOT

_product_list_vars += PRODUCT_SUPPORTS_VERITY

core/product_config.mk

+3 −0
Original line number Diff line number Diff line
@@ -228,6 +228,9 @@ PRODUCT_AAPT_CONFIG := $(PRODUCT_LOCALES) $(PRODUCT_AAPT_CONFIG) 
PRODUCT_AAPT_CONFIG_SP := $(PRODUCT_AAPT_CONFIG)

PRODUCT_AAPT_CONFIG := $(subst $(space),$(comma),$(PRODUCT_AAPT_CONFIG))



# Extra boot jars must be appended at the end after common boot jars.

PRODUCT_BOOT_JARS += $(PRODUCT_BOOT_JARS_EXTRA)



ifndef PRODUCT_SYSTEM_NAME

  PRODUCT_SYSTEM_NAME := $(PRODUCT_NAME)

endif