Propagate the device name changing back to FP2
Make sure the build.prop will use the proper product name too
instead of the flavour name.
FP-Id: FP2N-101
Change-Id: If2bbbd7e7f6e78bfcf1a54e099d2ca181f460355
Depends-On: I26d6062466d7672ca203a6372f98953786a1644e
diff --git a/device.mk b/device.mk
index a3e24bd..ce084f2 100644
--- a/device.mk
+++ b/device.mk
@@ -29,11 +29,6 @@
$(warning Pulling in full basic telephony)
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
-TARGET_VENDOR := Fairphone
-TARGET_VENDOR_PRODUCT_NAME := fp2
-TARGET_VENDOR_DEVICE_NAME := fp2
-PRODUCT_BUILD_PROP_OVERRIDES += TARGET_DEVICE=fp2 PRODUCT_NAME=fp2
-
## Use the latest approved GMS identifiers unless running a signed build
# ifneq ($(SIGN_BUILD),true)
# PRODUCT_BUILD_PROP_OVERRIDES += \
@@ -51,7 +46,7 @@
# PRODUCT_PACKAGE_OVERLAYS += device/fairphone/fp2-common/overlay
# TODO move to device?
-LOCAL_TEMP := device/fairphone/fp2
+LOCAL_TEMP := device/fairphone/FP2
# Media
PRODUCT_COPY_FILES += \
@@ -300,6 +295,12 @@
+# The product flavours will set PRODUCT_NAME to something else but really, we
+# are not allowed to change it because it was certified like this. To not break
+# the build system and still have some properties set with the fancy flavour
+# name, we only override the PRODUCT_NAME variable in the build.prop file.
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=FP2
+
PRODUCT_MANUFACTURER := Fairphone
PRODUCT_BRAND := Fairphone
-PRODUCT_DEVICE := fp2
+PRODUCT_DEVICE := FP2