extra: Strip down to what 14.1 supports

OpenWeatherProvider/Android.mk

@@ -1,28 +0,0 @@
-# Copyright (C) 2017-2018 The LineageOS Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# This file is generated by device/motorola/nash/setup-makefiles.sh
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := OpenWeatherProviderPrebuilt
-LOCAL_MODULE_OWNER := lineage
-LOCAL_SRC_FILES := OpenWeatherProviderPrebuilt.apk
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-include $(BUILD_PREBUILT)

oem-cameras/MotCamera2-denali/Android.mk

@@ -1,30 +0,0 @@
-# Copyright (C) 2017-2018 The LineageOS Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# This file is generated by device/motorola/nash/setup-makefiles.sh
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := MotCamera2-denali
-LOCAL_MODULE_OWNER := motorola
-LOCAL_SRC_FILES := MotCamera2-denali.apk
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_OVERRIDES_PACKAGES := Snap
-include $(BUILD_PREBUILT)

oem-cameras/MotCamera2-denali/MotCamera2-denali.mk

@@ -1,5 +0,0 @@
-PRODUCT_PACKAGES += \
-    MotCamera2-denali
-
-PRODUCT_COPY_FILES += \
-    vendor/extra/oem-cameras/MotCamera2-denali/privapp-permissions-com.motorola.camera2.denali.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-com.motorola.camera2.xml

oem-cameras/MotCamera2-denali/privapp-permissions-com.motorola.camera2.denali.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<permissions>
-    <privapp-permissions package="com.motorola.camera2.denali">
-
-        <!-- System defined permissions -->
-        <permission name="android.permission.STOP_APP_SWITCHES" />
-        <permission name="android.permission.WRITE_SECURE_SETTINGS" />
-        <permission name="android.permission.WRITE_MEDIA_STORAGE" />
-
-    </privapp-permissions>
-</permissions>

product.mk

@@ -6,26 +6,17 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
     vendor/extra/adb_keys:recovery/root/adb_keys
 
-## Custom Cameras
-# river
-ifneq ($(filter %river,$(TARGET_PRODUCT)),)
--include vendor/extra/oem-cameras/MotCamera2-denali/MotCamera2-denali.mk
-endif
-
 ## Media
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.config.vc_call_vol_steps=7 \
     ro.config.media_vol_steps=25
 
-## OpenWeatherProvider
-PRODUCT_PACKAGES += OpenWeatherProviderPrebuilt
-
 ## Recovery
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += persist.sys.recovery_update=true
 
 ## Updater
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += lineage.updater.uri="https://updater.oddsolutions.us/api/v1/{device}/{type}/{incr}"
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += lineage.updater.allow_downgrading=true
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += cm.updater.uri="https://updater.oddsolutions.us/api/v1/{device}/{type}/{incr}"
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += cm.updater.allow_downgrading=true
 
 ## Signing
 PRODUCT_DEFAULT_DEV_CERTIFICATE := vendor/certs/releasekey