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

Commit df762465 authored by JaeMan Park's avatar JaeMan Park Committed by Automerger Merge Worker
Browse files

Merge "Rename mainline_system(.*).mk to generic_system(.*).mk" am: 84b82254 

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

Change-Id: Icec496fb01a2bdad0ef109b3d012a68cfae2b90f
parents 02694ffe 84b82254

target/product/AndroidProducts.mk

+5 −1
Original line number Diff line number Diff line
@@ -55,12 +55,16 @@ PRODUCT_MAKEFILES := \ 
    $(LOCAL_DIR)/full.mk \

    $(LOCAL_DIR)/full_x86.mk \

    $(LOCAL_DIR)/generic.mk \

    $(LOCAL_DIR)/generic_system_arm64.mk \

    $(LOCAL_DIR)/generic_system_x86.mk \

    $(LOCAL_DIR)/generic_system_x86_64.mk \

    $(LOCAL_DIR)/generic_system_x86_arm.mk \

    $(LOCAL_DIR)/generic_x86.mk \

    $(LOCAL_DIR)/gsi_arm64.mk \

    $(LOCAL_DIR)/mainline_system_arm64.mk \

    $(LOCAL_DIR)/mainline_system_x86.mk \

    $(LOCAL_DIR)/mainline_system_x86_arm.mk \

    $(LOCAL_DIR)/mainline_system_x86_64.mk \

    $(LOCAL_DIR)/mainline_system_x86_arm.mk \

    $(LOCAL_DIR)/sdk_arm64.mk \

    $(LOCAL_DIR)/sdk.mk \

    $(LOCAL_DIR)/sdk_phone_arm64.mk \

target/product/aosp_arm.mk

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true 
#

# All components inherited here go to system image

#

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

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



# Enable mainline checking for excat this product name

ifeq (aosp_arm,$(TARGET_PRODUCT))

target/product/aosp_arm64.mk

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
# All components inherited here go to system image

#

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

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

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



# Enable mainline checking for excat this product name

ifeq (aosp_arm64,$(TARGET_PRODUCT))

target/product/aosp_arm64_ab.mk

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
# (The system image of Legacy GSI is not CSI)

#

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

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

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



# Enable mainline checking for excat this product name

ifeq (aosp_arm64_ab,$(TARGET_PRODUCT))

target/product/aosp_arm_ab.mk

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
# All components inherited here go to system image

# (The system image of Legacy GSI is not CSI)

#

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

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



# Enable mainline checking for excat this product name

ifeq (aosp_arm_ab,$(TARGET_PRODUCT))