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

Commit 3ccf730c authored Nov 19, 2020 by Treehugger Robot Committed by Gerrit Code Review Nov 19, 2020

Merge "Use 'inherit-product/inherit-product-if-exists to include config files"

parents ad33b891 66589d13

target/product/generic_x86.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		# This is a generic phone product that isn't specialized for a specific device.
		# It includes the base Android platform.

		include $(SRC_TARGET_DIR)/product/generic.mk
		$(call inherit-product, $(SRC_TARGET_DIR)/product/generic.mk)

		# Overrides
		PRODUCT_BRAND := generic_x86

target/product/sdk_phone_x86.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -50,8 +50,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
		$(call inherit-product, $(SRC_TARGET_DIR)/board/emulator_x86/device.mk)

		# Define the host tools and libs that are parts of the SDK.
		-include sdk/build/product_sdk.mk
		-include development/build/product_sdk.mk
		$(call inherit-product-if-exists, sdk/build/product_sdk.mk)
		$(call inherit-product-if-exists, development/build/product_sdk.mk)

		# Overrides
		PRODUCT_BRAND := Android

target/product/sdk_phone_x86_64.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -51,8 +51,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
		$(call inherit-product, $(SRC_TARGET_DIR)/board/emulator_x86_64/device.mk)

		# Define the host tools and libs that are parts of the SDK.
		-include sdk/build/product_sdk.mk
		-include development/build/product_sdk.mk
		$(call inherit-product-if-exists, sdk/build/product_sdk.mk)
		$(call inherit-product-if-exists, development/build/product_sdk.mk)

		# Overrides
		PRODUCT_BRAND := Android