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

Commit 34b62479 authored by Jackeagle's avatar Jackeagle
Browse files

Merge branch 'v1-s' of gitlab.e.foundation:e/os/android_vendor_eos into... 

Merge branch 'v1-s' of gitlab.e.foundation:e/os/android_vendor_eos into 6969devices-s-fp3-remove-packages
parents cdba3df7 86f4389b

config/common.mk

+8 −8
Original line number Diff line number Diff line
@@ -39,7 +39,9 @@ PRODUCT_PACKAGES += \ 
    AdvancedPrivacy \

    WeatherProvider \

    SplitInstallService \

    WebCalendarManager

    WebCalendarManager \

    Talkback \

    mapsOverlay



# Removes proprietary apps

PRODUCT_PACKAGES += \
@@ -80,17 +82,15 @@ PRODUCT_COPY_FILES += \ 
    $(VENDOR_PATH)/config/permissions/eos-allowlist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/eos-allowlist.xml



# SafetyNet compatibility

ifeq (stable,$(RELEASE_TYPE))

ifneq ($(filter stable dev partner,$(RELEASE_TYPE)),)

  # Ship ih8sn on dev & stable builds

  INCLUDE_IH8SN ?= true

endif



INCLUDE_IH8SN ?= false



PRODUCT_CONFIGURATION_FILE := vendor/eos/config/ih8sn/ih8sn_$(subst lineage_,,$(TARGET_PRODUCT)).conf

DEFAULT_CONFIGURATION_FILE := vendor/eos/config/ih8sn/ih8sn_default.conf

ifeq (true,$(INCLUDE_IH8SN))

  ifneq (,$(wildcard $(PRODUCT_CONFIGURATION_FILE)))

  PRODUCT_PACKAGES += ih8sn

    PRODUCT_COPY_FILES += \

        $(PRODUCT_CONFIGURATION_FILE):$(TARGET_COPY_OUT_SYSTEM)/etc/ih8sn.conf

  endif

  PRODUCT_COPY_FILES += $(DEFAULT_CONFIGURATION_FILE):$(TARGET_COPY_OUT_SYSTEM)/etc/ih8sn.conf

endif

config/ih8sn/ih8sn_FP3.conf

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line 
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

config/ih8sn/ih8sn_FP4.conf

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line 
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

config/ih8sn/ih8sn_coral.conf

deleted100644 → 0
+0 −5
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