aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoonas Kylmälä <joonas.kylmala@iki.fi>2018-09-01 07:05:47 -0400
committerJoonas Kylmälä <joonas.kylmala@iki.fi>2018-09-01 07:05:47 -0400
commitf9cb264f57c30a2bdbb47a050caa7cf79d195e00 (patch)
tree76f74a02ba30d4bf342ef4aed781e1be05ee827b
parent680cecb74051c4dbec49c3128a793a288b7c0a48 (diff)
parent5e7af2bced20c01626393ca5a465bda2f921da2a (diff)
downloaddevice_samsung_espresso3g-f9cb264f57c30a2bdbb47a050caa7cf79d195e00.tar.gz
device_samsung_espresso3g-f9cb264f57c30a2bdbb47a050caa7cf79d195e00.tar.bz2
device_samsung_espresso3g-f9cb264f57c30a2bdbb47a050caa7cf79d195e00.zip
Merge remote-tracking branch 'lineageos/cm-13.0' into replicant-6.0
-rw-r--r--lineage.mk10
-rw-r--r--overlay/custom/frameworks/base/core/res/res/values/config.xml (renamed from overlay/cm/frameworks/base/core/res/res/values/config.xml)0
2 files changed, 8 insertions, 2 deletions
diff --git a/lineage.mk b/lineage.mk
index 543ec65..4b9353e 100644
--- a/lineage.mk
+++ b/lineage.mk
@@ -21,8 +21,8 @@ TARGET_BOOTANIMATION_NAME := vertical-540x960
$(call inherit-product, vendor/replicant/config/common_full_phone.mk)
# LineageOS specific overlay
-DEVICE_PACKAGE_OVERLAYS += device/samsung/espresso3g/overlay/cm
-DEVICE_PACKAGE_OVERLAYS += device/samsung/espressowifi/overlay/cm-common
+DEVICE_PACKAGE_OVERLAYS += device/samsung/espresso3g/overlay/custom
+DEVICE_PACKAGE_OVERLAYS += device/samsung/espressowifi/overlay/custom-common
# Inherit device specific configuration
$(call inherit-product, device/samsung/espresso3g/aosp_espresso3g.mk)
@@ -30,6 +30,12 @@ $(call inherit-product, device/samsung/espresso3g/aosp_espresso3g.mk)
# Device identifier. This must come after all inclusions
PRODUCT_NAME := replicant_espresso3g
+# Device build info and fingerprint
+PRODUCT_BUILD_PROP_OVERRIDES += \
+ PRODUCT_NAME=espresso10rfxx \
+ BUILD_FINGERPRINT="samsung/espresso10rfxx/espresso10rf:4.2.2/JDQ39/P5100XXDNA1:user/release-keys" \
+ PRIVATE_BUILD_DESC="espresso10rfxx-user 4.2.2 JDQ39 P5100XXDNA1 release-keys"
+
# Packages
PRODUCT_PACKAGES += \
SamsungServiceMode
diff --git a/overlay/cm/frameworks/base/core/res/res/values/config.xml b/overlay/custom/frameworks/base/core/res/res/values/config.xml
index 1375d9f..1375d9f 100644
--- a/overlay/cm/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/custom/frameworks/base/core/res/res/values/config.xml