g12: Change proprietary makefiles inheritance order

Change-Id: I65da3e542b763b0435a051892e3974673c95876e

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index e80d8a82c81bc08a1b0223a32d1a6c0001248791..ca89a1522be22e229a7ba686ca66ac9acba6b42c 100644 (file)
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -4,8 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-include vendor/amlogic/g12-common/BoardConfigVendor.mk
-
 COMMON_PATH := device/amlogic/g12-common
 
 ## Android Verified Boot
@@ -132,3 +130,6 @@ WPA_SUPPLICANT_VERSION := VER_0_8_X
 
 ## Include the main common tree BoardConfig makefile
 include device/amlogic/common/BoardConfigAmlogic.mk
+
+## Include the common proprietary BoardConfig makefile
+include vendor/amlogic/g12-common/BoardConfigVendor.mk

diff --git a/g12.mk b/g12.mk
index 20cb99e88b2d6066b87240b97f86dc51778572f6..9da077b45f8a5f94f1157dd3eb85c122e34849d4 100644 (file)
--- a/g12.mk
+++ b/g12.mk
@@ -4,8 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-$(call inherit-product, vendor/amlogic/g12-common/g12-common-vendor.mk)
-
 ## Audio
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/audio/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \
@@ -243,3 +241,6 @@ PRODUCT_PACKAGES += \
 
 ## Inherit from the main common tree product makefile
 $(call inherit-product, device/amlogic/common/amlogic.mk)
+
+## Inherit from the common proprietary files makefile
+$(call inherit-product, vendor/amlogic/g12-common/g12-common-vendor.mk)