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

Commit 09ecfdde authored Aug 15, 2019 by Remi NGUYEN VAN Committed by android-build-merger Aug 15, 2019

Merge "Add a product build var for mainline module certs" am: a7832d55 am:...

Merge "Add a product build var for mainline module certs" am: a7832d55 am: ff51a362 am: 79f85cbb
am: c866dd59

Change-Id: I0f68ac37b60f95ef426a970073df55289a7f43fc

parents a9d9df96 c866dd59

core/config.mk

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -785,6 +785,13 @@ else
	endif		endif
	.KATI_READONLY := DEFAULT_SYSTEM_DEV_CERTIFICATE		.KATI_READONLY := DEFAULT_SYSTEM_DEV_CERTIFICATE

			# Certificate for the NetworkStack sepolicy context
			ifdef PRODUCT_MAINLINE_SEPOLICY_DEV_CERTIFICATES
			MAINLINE_SEPOLICY_DEV_CERTIFICATES := $(PRODUCT_MAINLINE_SEPOLICY_DEV_CERTIFICATES)
			else
			MAINLINE_SEPOLICY_DEV_CERTIFICATES := $(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE))
			endif

	BUILD_NUMBER_FROM_FILE := $$(cat $(OUT_DIR)/build_number.txt)		BUILD_NUMBER_FROM_FILE := $$(cat $(OUT_DIR)/build_number.txt)
	BUILD_DATETIME_FROM_FILE := $$(cat $(BUILD_DATETIME_FILE))		BUILD_DATETIME_FROM_FILE := $$(cat $(BUILD_DATETIME_FILE))

core/product-graph.mk

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -131,6 +131,7 @@ $(OUT_DIR)/products/$(strip $(1)).txt: $(this_makefile)
	$(hide) echo 'PRODUCT_SDK_ADDON_DOC_MODULES=$$(PRODUCTS.$(strip $(1)).PRODUCT_SDK_ADDON_DOC_MODULES)' >> $$@		$(hide) echo 'PRODUCT_SDK_ADDON_DOC_MODULES=$$(PRODUCTS.$(strip $(1)).PRODUCT_SDK_ADDON_DOC_MODULES)' >> $$@
	$(hide) echo 'PRODUCT_DEFAULT_WIFI_CHANNELS=$$(PRODUCTS.$(strip $(1)).PRODUCT_DEFAULT_WIFI_CHANNELS)' >> $$@		$(hide) echo 'PRODUCT_DEFAULT_WIFI_CHANNELS=$$(PRODUCTS.$(strip $(1)).PRODUCT_DEFAULT_WIFI_CHANNELS)' >> $$@
	$(hide) echo 'PRODUCT_DEFAULT_DEV_CERTIFICATE=$$(PRODUCTS.$(strip $(1)).PRODUCT_DEFAULT_DEV_CERTIFICATE)' >> $$@		$(hide) echo 'PRODUCT_DEFAULT_DEV_CERTIFICATE=$$(PRODUCTS.$(strip $(1)).PRODUCT_DEFAULT_DEV_CERTIFICATE)' >> $$@
			$(hide) echo 'PRODUCT_MAINLINE_SEPOLICY_DEV_CERTIFICATES=$$(PRODUCTS.$(strip $(1)).PRODUCT_MAINLINE_SEPOLICY_DEV_CERTIFICATES)' >> $$@
	$(hide) echo 'PRODUCT_RESTRICT_VENDOR_FILES=$$(PRODUCTS.$(strip $(1)).PRODUCT_RESTRICT_VENDOR_FILES)' >> $$@		$(hide) echo 'PRODUCT_RESTRICT_VENDOR_FILES=$$(PRODUCTS.$(strip $(1)).PRODUCT_RESTRICT_VENDOR_FILES)' >> $$@
	$(hide) echo 'PRODUCT_VENDOR_KERNEL_HEADERS=$$(PRODUCTS.$(strip $(1)).PRODUCT_VENDOR_KERNEL_HEADERS)' >> $$@		$(hide) echo 'PRODUCT_VENDOR_KERNEL_HEADERS=$$(PRODUCTS.$(strip $(1)).PRODUCT_VENDOR_KERNEL_HEADERS)' >> $$@

core/product.mk

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -205,6 +205,7 @@ _product_list_vars += PRODUCT_SOONG_NAMESPACES

	_product_list_vars += PRODUCT_DEFAULT_WIFI_CHANNELS		_product_list_vars += PRODUCT_DEFAULT_WIFI_CHANNELS
	_product_list_vars += PRODUCT_DEFAULT_DEV_CERTIFICATE		_product_list_vars += PRODUCT_DEFAULT_DEV_CERTIFICATE
			_product_list_vars += PRODUCT_MAINLINE_SEPOLICY_DEV_CERTIFICATES
	_product_list_vars += PRODUCT_RESTRICT_VENDOR_FILES		_product_list_vars += PRODUCT_RESTRICT_VENDOR_FILES

	# The list of product-specific kernel header dirs		# The list of product-specific kernel header dirs