land: Improve platform flag inheritance

Change-Id: I709f034ab474a8008aaa60214c009314abb14cd2
This commit is contained in:
Zhao Wei Liew 2016-11-09 09:12:36 +08:00
parent 978908e659
commit d4d24efb54
3 changed files with 7 additions and 4 deletions

View file

@ -17,6 +17,9 @@
DEVICE_PATH := device/xiaomi/land DEVICE_PATH := device/xiaomi/land
CM_PATH := vendor/cm/device/board CM_PATH := vendor/cm/device/board
# Define platform before including any common things
include $(DEVICE_PATH)/PlatformConfig.mk
# Inherit common ARM64 board fragments # Inherit common ARM64 board fragments
include $(CM_PATH)/common/arm64/architecture.mk include $(CM_PATH)/common/arm64/architecture.mk
include $(CM_PATH)/common/arm64/binder.mk include $(CM_PATH)/common/arm64/binder.mk

8
cm.mk
View file

@ -14,6 +14,9 @@
# limitations under the License. # limitations under the License.
# #
# Define platform before including any common things
$(call inherit-product, $(LOCAL_PATH)/PlatformConfig.mk)
# Inherit from those products. Most specific first. # Inherit from those products. Most specific first.
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
@ -22,10 +25,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
$(call inherit-product, vendor/cm/config/common_full_phone.mk) $(call inherit-product, vendor/cm/config/common_full_phone.mk)
# Inherit from land device # Inherit from land device
$(call inherit-product, device/xiaomi/land/device.mk) $(call inherit-product, $(LOCAL_PATH)/device.mk)
# Must define platform before including any common things
$(call inherit-product, device/xiaomi/land/board/00-qcom-platform-msm8937.mk)
PRODUCT_BRAND := Xiaomi PRODUCT_BRAND := Xiaomi
PRODUCT_DEVICE := land PRODUCT_DEVICE := land