Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e919f10 authored by Jan Altensen's avatar Jan Altensen
Browse files

Merge branch 'epic13-s-bringup' into 'v1-s'

Port changes from v1-r

See merge request !29
parents 83e217a1 9915d58d
Loading
Loading
Loading
Loading
+43 −2
Original line number Diff line number Diff line
@@ -14,6 +14,44 @@

VENDOR_PATH := vendor/eos

# /e/ OS packages
PRODUCT_PACKAGES += \
    eSpeakTTS \
    GmsCore \
    GsfProxy \
    FakeStore \
    com.google.android.maps.jar \
    Mail \
    BlissLauncher \
    BlissIconPack \
    MozillaNlpBackend \
    OpenWeatherMapWeatherProvider \
    AccountManager \
    Camera \
    eDrive \
    Notes \
    Tasks \
    NominatimNlpBackend \
    DroidGuard \
    OpenKeychain \
    Message \
    Browser \
    BrowserWebView \
    Apps \
    PwaPlayer \
    PrivacyCentral \
    WeatherProvider

# Optional applications
MINIMAL_APPS ?= false

ifeq ($(MINIMAL_APPS),false)
PRODUCT_PACKAGES += \
    MagicEarth \
    PdfViewer \
    LibreOfficeViewer
endif

# CustomLocale
ifeq (test,$(RELEASE_TYPE))
PRODUCT_PACKAGES += \
@@ -24,14 +62,17 @@ endif
DEVICE_PACKAGE_OVERLAYS += \
    $(VENDOR_PATH)/overlay

# Permissions
PRODUCT_COPY_FILES += \
    $(VENDOR_PATH)/config/permissions/org.lineageos.weather.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/org.lineageos.weather.xml

# Pre-granted eos-permissions and allowlist
PRODUCT_COPY_FILES += \
    $(VENDOR_PATH)/config/permissions/eos-permissions.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/default-permissions/eos-permissions.xml \
    $(VENDOR_PATH)/config/permissions/eos-allowlist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/eos-allowlist.xml

# SafetyNet compatibility
ifneq (test,$(RELEASE_TYPE))
  # Ship ih8sn on dev & stable builds
ifeq (stable,$(RELEASE_TYPE))
  INCLUDE_IH8SN ?= true
endif

+4 −0
Original line number Diff line number Diff line
# Default notification/alarm sounds
PRODUCT_PRODUCT_PROPERTIES += \
    ro.config.notification_sound=Selenium.ogg \
    ro.config.alarm_alert=Platinum-old.ogg
+1 −0
Original line number Diff line number Diff line
@@ -2,3 +2,4 @@ BUILD_SECURITY_PATCH_DATE=2022-01-05
BUILD_FINGERPRINT=Fairphone/FP3/FP3:10/8901.3.A.0135.20211222/gms-3e31ddee:user/release-keys
DEBUGGABLE=0
BUILD_TAGS=release-keys
BUILD_TYPE=user
+1 −0
Original line number Diff line number Diff line
@@ -2,3 +2,4 @@ BUILD_SECURITY_PATCH_DATE=2021-12-05
BUILD_FINGERPRINT=Fairphone/FP4eea/FP4:11/RKQ1.210503.001/FP3Q:user/release-keys
DEBUGGABLE=0
BUILD_TAGS=release-keys
BUILD_TYPE=user
+5 −0
Original line number Diff line number Diff line
BUILD_FINGERPRINT=google/coral/coral:11/RQ3A.211001.001/7641976:user/release-keys
BUILD_SECURITY_PATCH_DATE=2021-10-01
DEBUGGABLE=0
BUILD_TAGS=release-keys
BUILD_TYPE=user
Loading