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

Commit d6b56ebb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use 'inherit-product/inherit-product-if-exists to include config files" am: 3ccf730c 

Original change: https://android-review.googlesource.com/c/platform/build/+/1493738

Change-Id: I05ee2dc8b5a0d285f80a9c7729c23f8bdee2c260
parents 685f2038 3ccf730c

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