Inherit from vendor setup first
When inheriting from framework-defined setups before our own
vendor-specific setups, vendor build rules such as
PRODUCT_PROPERTY_OVERRIDES do not get applied when conflicting with the
system rules. This also follows the include order in Android 7.
Issue: FP2P-309
Change-Id: Idfa0fa40d4abcc973e3dcc36173c950f00442df6
diff --git a/device.mk b/device.mk
index 4ac2a71..0a9cc70 100644
--- a/device.mk
+++ b/device.mk
@@ -13,6 +13,9 @@
# limitations under the License.
#
+# Call the vendor setup
+$(call inherit-product-if-exists, vendor/fairphone/fp2-common/device-vendor.mk)
+
# camera_detect
$(call inherit-product-if-exists, device/fairphone/fp2-common/camera_detect/camera_detect.mk)
@@ -381,6 +384,3 @@
sap.conf
PRODUCT_PACKAGES += senread
-
-# Call the vendor setup
-$(call inherit-product-if-exists, vendor/fairphone/fp2-common/device-vendor.mk)