openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

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

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

Change-Id: I05ee2dc8b5a0d285f80a9c7729c23f8bdee2c260
This commit is contained in:
Treehugger Robot 2020-11-20 01:12:10 +00:00 committed by Automerger Merge Worker
parent 685f2038b4 3ccf730cdc
commit d6b56ebb57
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/product/generic_x86.mk
View File

@ -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

4
target/product/sdk_phone_x86.mk
View File

@ -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

4
target/product/sdk_phone_x86_64.mk
View File

@ -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