Build fixes + new blob blocker

Patches/Common/android_vendor_divested/blob_blocker.mk

@@ -0,0 +1,94 @@
+include $(CLEAR_VARS)
+
+# vendor makefiles often end up with these not being removed from Android.mk
+# which causes build failures since their files were deleted
+# override here to prevent breakage
+
+LOCAL_MODULE := BlobBlocker
+
+LOCAL_OVERRIDES_PACKAGES := \
+    a4wpservice \
+    appdirectedsmspermission \
+    AppDirectedSMSProxy \
+    ApplicationBar \
+    aptxui \
+    atfwd \
+    AtvRemoteService \
+    BuaContactAdapter \
+    CABLService \
+    CanvasPackageInstaller \
+    CarrierServices \
+    CNEService \
+    colorservice \
+    ConnMO \
+    CQATest \
+    DCMO \
+    DiagMon \
+    DMConfigUpdate \
+    DMService \
+    DolbyVisionService \
+    dpmserviceapp \
+    DragonKeyboardFirmwareUpdater \
+    DTVPlayer \
+    DTVService \
+    EasyAccessService \
+    embms \
+    FMRadioGooogle \
+    FmRadioTrampoline2 \
+    GamepadPairingService \
+    GCS \
+    GeminiInputDevices \
+    Gemini_Keyboard \
+    GlobalkeyInteceptor \
+    HiddenMenu \
+    HotwordEnrollment \
+    HWSarControlService \
+    imssettings \
+    LeanbackIme \
+    LeanbackLauncher \
+    LifetimeData \
+    LifeTimerService \
+    ModFmwkProxyService \
+    ModService \
+    MotCameraMod \
+    MotoDisplayFWProxy \
+    MotoSignatureApp \
+    MyVerizonServices \
+    OBDM_Permissions \
+    obdm_stub \
+    Overscan \
+    Perfdump \
+    PowerOffAlarm \
+    PPPreference \
+    ProjecterApp \
+    QtiTetherService \
+    QuickBoot \
+    RCSBootstraputil \
+    RcsImsBootstraputil \
+    RemoteControlService \
+    SDM \
+    SecPhone \
+    SecProtect \
+    SprintDM \
+    SprintHM \
+    SprintMenu \
+    SyncMLSvc \
+    SystemUpdateUI \
+    TriggerEnroll \
+    TriggerTrainingService \
+    Tycho \
+    uceShimService \
+    VerizonAuthDialog \
+    VerizonSSOEngine \
+    VerizonUnifiedSettings \
+    VZWAPNLib \
+    vzwapnpermission \
+    VZWAPNService \
+    VZWAVS \
+    VzwLcSilent \
+    vzw_msdc_api \
+    VzwOmaTrigger \
+    WfcActivation \
+    WfdService
+
+include $(BUILD_PREBUILT)

Patches/Common/android_vendor_divested/divestos.mk

@@ -16,8 +16,9 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.config.alarm_alert=Alarm_Buzzer.ogg \
     keyguard.no_require_sim=true \
     ro.build.selinux=1 \
-    ro.storage_manager.enabled=false \
-    ro.control_privapp_permissions=log
+    ro.storage_manager.enabled=false
+#    ro.control_privapp_permissions=log
+#    ro.control_privapp_permissions=enforce
 
 #Copy extra files
 PRODUCT_COPY_FILES += \
@@ -25,5 +26,6 @@ PRODUCT_COPY_FILES += \
     vendor/divested/prebuilts/etc/permissions_org.fdroid.fdroid.privileged.xml:system/etc/permissions/permissions_org.fdroid.fdroid.privileged.xml
 
 #Include packages
-#PRODUCT_PACKAGES += ModuleBlocker
+PRODUCT_PACKAGES += BlobBlocker
+PRODUCT_PACKAGES += ModuleBlocker
 include vendor/divested/packages.mk