Update fix-devicenames patch to support /Pixel 1.*/ and /Pixel 2 XL/

patches/platform/fix-devicenames.patch

@@ -26,3 +26,47 @@ index 9e871a4..8811c5a 100644
 
  # Audio XMLs
  PRODUCT_COPY_FILES += \
+
+project device/google/marlin/
+diff --git a/device/google/marlin/aosp_marlin.mk b/device/google/marlin/aosp_marlin.mk
+index b82aaf73..1b9d9e7f 100644
+--- a/device/google/marlin/aosp_marlin.mk
++++ b/device/google/marlin/aosp_marlin.mk
+@@ -24,8 +24,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
+ PRODUCT_NAME := aosp_marlin
+ PRODUCT_DEVICE := marlin
+ PRODUCT_BRAND := Android
+-PRODUCT_MODEL := AOSP on msm8996
+-PRODUCT_MANUFACTURER := google
++PRODUCT_MODEL := Pixel XL
++PRODUCT_MANUFACTURER := Google
+ PRODUCT_RESTRICT_VENDOR_FILES := true
+
+ PRODUCT_COPY_FILES += device/google/marlin/fstab.common:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.marlin
+diff --git a/device/google/marlin/aosp_sailfish.mk b/device/google/marlin/aosp_sailfish.mk
+index 4c0ef719..675f11a6 100644
+--- a/device/google/marlin/aosp_sailfish.mk
++++ b/device/google/marlin/aosp_sailfish.mk
+@@ -24,8 +24,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
+ PRODUCT_NAME := aosp_sailfish
+ PRODUCT_DEVICE := sailfish
+ PRODUCT_BRAND := Android
+-PRODUCT_MODEL := AOSP on msm8996
+-PRODUCT_MANUFACTURER := google
++PRODUCT_MODEL := Pixel
++PRODUCT_MANUFACTURER := Google
+ PRODUCT_RESTRICT_VENDOR_FILES := true
+
+ PRODUCT_COPY_FILES += device/google/marlin/fstab.common:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.sailfish
+
+project device/google/taimen/
+diff --git a/device/google/taimen/aosp_taimen.mk b/device/google/taimen/aosp_taimen.mk
+index 5653fd5..3729530 100644
+--- a/device/google/taimen/aosp_taimen.mk
++++ b/device/google/taimen/aosp_taimen.mk
+@@ -39,4 +39,4 @@ PRODUCT_MANUFACTURER := Google
+ PRODUCT_BRAND := Android
+ PRODUCT_NAME := aosp_taimen
+ PRODUCT_DEVICE := taimen
+-PRODUCT_MODEL := AOSP on taimen
++PRODUCT_MODEL := Pixel 2 XL