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

Unverified Commit a3b0920e authored by Michael Bestas's avatar Michael Bestas Committed by Michael Bestas
Browse files

Move CM build additions to vendor/cm/build 

Change-Id: I39d3e711a6beab47e3284919a9a4fef15b0f40b9
parent 2889a13f

core/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -1042,10 +1042,6 @@ OTA_PUBLIC_KEYS := $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem 
ifneq ($(OTA_PACKAGE_SIGNING_KEY),)

    OTA_PUBLIC_KEYS := $(OTA_PACKAGE_SIGNING_KEY).x509.pem

    PRODUCT_EXTRA_RECOVERY_KEYS := $(DEFAULT_SYSTEM_DEV_CERTIFICATE)

else

    PRODUCT_EXTRA_RECOVERY_KEYS += \

        build/target/product/security/cm \

        build/target/product/security/cm-devkey

endif



# Generate a file containing the keys that will be read by the

core/config.mk

+2 −2
Original line number Diff line number Diff line
@@ -658,10 +658,10 @@ else 
endif



# Rules for QCOM targets

include $(BUILD_SYSTEM)/qcom_target.mk

include vendor/cm/build/core/qcom_target.mk



# Rules for MTK targets

include $(BUILD_SYSTEM)/mtk_target.mk

include vendor/cm/build/core/mtk_target.mk



# ###############################################################

# Set up final options.

core/main.mk

+2 −2
Original line number Diff line number Diff line
@@ -146,10 +146,10 @@ endif 
include $(BUILD_SYSTEM)/cleanbuild.mk



# Bring in Qualcomm helper macros

include $(BUILD_SYSTEM)/qcom_utils.mk

include vendor/cm/build/core/qcom_utils.mk



# Bring in Mediatek helper macros too

include $(BUILD_SYSTEM)/mtk_utils.mk

include vendor/cm/build/core/mtk_utils.mk



# Include the google-specific config

-include vendor/google/build/config.mk

core/mtk_target.mk

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
ifeq ($(BOARD_USES_MTK_HARDWARE),true)

    mtk_flags := -DMTK_HARDWARE



    TARGET_GLOBAL_CFLAGS += $(mtk_flags)

    TARGET_GLOBAL_CPPFLAGS += $(mtk_flags)

    CLANG_TARGET_GLOBAL_CFLAGS += $(mtk_flags)

    CLANG_TARGET_GLOBAL_CPPFLAGS += $(mtk_flags)



    2ND_TARGET_GLOBAL_CFLAGS += $(mtk_flags)

    2ND_TARGET_GLOBAL_CPPFLAGS += $(mtk_flags)

    2ND_CLANG_TARGET_GLOBAL_CFLAGS += $(mtk_flags)

    2ND_CLANG_TARGET_GLOBAL_CPPFLAGS += $(mtk_flags)

endif

core/mtk_utils.mk

deleted100755 → 0
+0 −5
Original line number Diff line number Diff line 
# Board platforms lists to be used for

# TARGET_BOARD_PLATFORM specific featurization

MTK_BOARD_PLATFORMS := mt6592

MTK_BOARD_PLATFORMS += mt6582

MTK_BOARD_PLATFORMS += mt6572