StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Bug: 172923994
Test: treehugger
Change-Id: I762dfa8dc48c0b09597d2f7b6ef7f53062915a79
This commit is contained in:
Sasha Smundak
2020-11-10 09:47:44 -08:00
parent 4cecc43796
commit 66589d1328
3 changed files with 5 additions and 5 deletions
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. # This is a generic phone product that isn't specialized for a specific device.
# It includes the base Android platform. # It includes the base Android platform.
include $(SRC_TARGET_DIR)/product/generic.mk $(call inherit-product, $(SRC_TARGET_DIR)/product/generic.mk)
# Overrides # Overrides
PRODUCT_BRAND := generic_x86 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) $(call inherit-product, $(SRC_TARGET_DIR)/board/emulator_x86/device.mk)
# Define the host tools and libs that are parts of the SDK. # Define the host tools and libs that are parts of the SDK.
-include sdk/build/product_sdk.mk $(call inherit-product-if-exists, sdk/build/product_sdk.mk)
-include development/build/product_sdk.mk $(call inherit-product-if-exists, development/build/product_sdk.mk)
# Overrides # Overrides
PRODUCT_BRAND := Android 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) $(call inherit-product, $(SRC_TARGET_DIR)/board/emulator_x86_64/device.mk)
# Define the host tools and libs that are parts of the SDK. # Define the host tools and libs that are parts of the SDK.
-include sdk/build/product_sdk.mk $(call inherit-product-if-exists, sdk/build/product_sdk.mk)
-include development/build/product_sdk.mk $(call inherit-product-if-exists, development/build/product_sdk.mk)
# Overrides # Overrides
PRODUCT_BRAND := Android PRODUCT_BRAND := Android