diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/cm_audio.mk | 8 | ||||
| -rw-r--r-- | config/cmsdk_common.mk | 22 | ||||
| -rw-r--r-- | config/common.mk | 141 | ||||
| -rw-r--r-- | config/common_full.mk | 9 | ||||
| -rw-r--r-- | config/common_full_phone.mk | 8 | ||||
| -rw-r--r-- | config/common_full_tablet_wifionly.mk | 4 | ||||
| -rw-r--r-- | config/common_mini_phone.mk | 4 | ||||
| -rw-r--r-- | config/common_mini_tablet_wifionly.mk | 4 | ||||
| -rw-r--r-- | config/nfc_enhanced.mk | 2 | ||||
| -rw-r--r-- | config/telephony.mk | 2 |
10 files changed, 73 insertions, 131 deletions
diff --git a/config/cm_audio.mk b/config/cm_audio.mk index f5f659f..1fb7d31 100644 --- a/config/cm_audio.mk +++ b/config/cm_audio.mk @@ -2,10 +2,10 @@ # CyanogenMod Audio Files # -ALARM_PATH := vendor/cm/prebuilt/common/media/audio/alarms -NOTIFICATION_PATH := vendor/cm/prebuilt/common/media/audio/notifications -RINGTONE_PATH := vendor/cm/prebuilt/common/media/audio/ringtones -UI_PATH := vendor/cm/prebuilt/common/media/audio/ui +ALARM_PATH := vendor/replicant/prebuilt/common/media/audio/alarms +NOTIFICATION_PATH := vendor/replicant/prebuilt/common/media/audio/notifications +RINGTONE_PATH := vendor/replicant/prebuilt/common/media/audio/ringtones +UI_PATH := vendor/replicant/prebuilt/common/media/audio/ui # Alarms PRODUCT_COPY_FILES += \ diff --git a/config/cmsdk_common.mk b/config/cmsdk_common.mk index 7856371..e8b1907 100644 --- a/config/cmsdk_common.mk +++ b/config/cmsdk_common.mk @@ -1,16 +1,16 @@ # Permissions for cmsdk services PRODUCT_COPY_FILES += \ - vendor/cm/config/permissions/org.cyanogenmod.appsuggest.xml:system/etc/permissions/org.cyanogenmod.appsuggest.xml \ - vendor/cm/config/permissions/org.cyanogenmod.audio.xml:system/etc/permissions/org.cyanogenmod.audio.xml \ - vendor/cm/config/permissions/org.cyanogenmod.livedisplay.xml:system/etc/permissions/org.cyanogenmod.livedisplay.xml \ - vendor/cm/config/permissions/org.cyanogenmod.livelockscreen.xml:system/etc/permissions/org.cyanogenmod.livelockscreen.xml \ - vendor/cm/config/permissions/org.cyanogenmod.partner.xml:system/etc/permissions/org.cyanogenmod.partner.xml \ - vendor/cm/config/permissions/org.cyanogenmod.performance.xml:system/etc/permissions/org.cyanogenmod.performance.xml \ - vendor/cm/config/permissions/org.cyanogenmod.profiles.xml:system/etc/permissions/org.cyanogenmod.profiles.xml \ - vendor/cm/config/permissions/org.cyanogenmod.statusbar.xml:system/etc/permissions/org.cyanogenmod.statusbar.xml \ - vendor/cm/config/permissions/org.cyanogenmod.telephony.xml:system/etc/permissions/org.cyanogenmod.telephony.xml \ - vendor/cm/config/permissions/org.cyanogenmod.theme.xml:system/etc/permissions/org.cyanogenmod.theme.xml \ - vendor/cm/config/permissions/org.cyanogenmod.weather.xml:system/etc/permissions/org.cyanogenmod.weather.xml + vendor/replicant/config/permissions/org.cyanogenmod.appsuggest.xml:system/etc/permissions/org.cyanogenmod.appsuggest.xml \ + vendor/replicant/config/permissions/org.cyanogenmod.audio.xml:system/etc/permissions/org.cyanogenmod.audio.xml \ + vendor/replicant/config/permissions/org.cyanogenmod.livedisplay.xml:system/etc/permissions/org.cyanogenmod.livedisplay.xml \ + vendor/replicant/config/permissions/org.cyanogenmod.livelockscreen.xml:system/etc/permissions/org.cyanogenmod.livelockscreen.xml \ + vendor/replicant/config/permissions/org.cyanogenmod.partner.xml:system/etc/permissions/org.cyanogenmod.partner.xml \ + vendor/replicant/config/permissions/org.cyanogenmod.performance.xml:system/etc/permissions/org.cyanogenmod.performance.xml \ + vendor/replicant/config/permissions/org.cyanogenmod.profiles.xml:system/etc/permissions/org.cyanogenmod.profiles.xml \ + vendor/replicant/config/permissions/org.cyanogenmod.statusbar.xml:system/etc/permissions/org.cyanogenmod.statusbar.xml \ + vendor/replicant/config/permissions/org.cyanogenmod.telephony.xml:system/etc/permissions/org.cyanogenmod.telephony.xml \ + vendor/replicant/config/permissions/org.cyanogenmod.theme.xml:system/etc/permissions/org.cyanogenmod.theme.xml \ + vendor/replicant/config/permissions/org.cyanogenmod.weather.xml:system/etc/permissions/org.cyanogenmod.weather.xml # CM Platform Library PRODUCT_PACKAGES += \ diff --git a/config/common.mk b/config/common.mk index bb74ecd..f2c8e76 100644 --- a/config/common.mk +++ b/config/common.mk @@ -1,4 +1,4 @@ -PRODUCT_BRAND ?= cyanogenmod +PRODUCT_BRAND ?= replicant ifneq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space)) # determine the smaller dimension @@ -10,7 +10,7 @@ TARGET_BOOTANIMATION_SIZE := $(shell \ fi ) # get a sorted list of the sizes -bootanimation_sizes := $(subst .zip,, $(shell ls vendor/cm/prebuilt/common/bootanimation)) +bootanimation_sizes := $(subst .zip,, $(shell ls vendor/replicant/prebuilt/common/bootanimation)) bootanimation_sizes := $(shell echo -e $(subst $(space),'\n',$(bootanimation_sizes)) | sort -rn) # find the appropriate size and set @@ -27,9 +27,9 @@ endef $(foreach size,$(bootanimation_sizes), $(call check_and_set_bootanimation,$(size))) ifeq ($(TARGET_BOOTANIMATION_HALF_RES),true) -PRODUCT_BOOTANIMATION := vendor/cm/prebuilt/common/bootanimation/halfres/$(TARGET_BOOTANIMATION_NAME).zip +PRODUCT_BOOTANIMATION := vendor/replicant/prebuilt/common/bootanimation/halfres/$(TARGET_BOOTANIMATION_NAME).zip else -PRODUCT_BOOTANIMATION := vendor/cm/prebuilt/common/bootanimation/$(TARGET_BOOTANIMATION_NAME).zip +PRODUCT_BOOTANIMATION := vendor/replicant/prebuilt/common/bootanimation/$(TARGET_BOOTANIMATION_NAME).zip endif endif @@ -72,14 +72,14 @@ endif # Copy over the changelog to the device PRODUCT_COPY_FILES += \ - vendor/cm/CHANGELOG.mkdn:system/etc/CHANGELOG-CM.txt + vendor/replicant/CHANGELOG.mkdn:system/etc/CHANGELOG-CM.txt # Backup Tool PRODUCT_COPY_FILES += \ - vendor/cm/prebuilt/common/bin/backuptool.sh:install/bin/backuptool.sh \ - vendor/cm/prebuilt/common/bin/backuptool.functions:install/bin/backuptool.functions \ - vendor/cm/prebuilt/common/bin/50-cm.sh:system/addon.d/50-cm.sh \ - vendor/cm/prebuilt/common/bin/blacklist:system/addon.d/blacklist + vendor/replicant/prebuilt/common/bin/backuptool.sh:install/bin/backuptool.sh \ + vendor/replicant/prebuilt/common/bin/backuptool.functions:install/bin/backuptool.functions \ + vendor/replicant/prebuilt/common/bin/50-cm.sh:system/addon.d/50-cm.sh \ + vendor/replicant/prebuilt/common/bin/blacklist:system/addon.d/blacklist # Backup Services whitelist PRODUCT_COPY_FILES += \ @@ -87,26 +87,30 @@ PRODUCT_COPY_FILES += \ # Signature compatibility validation PRODUCT_COPY_FILES += \ - vendor/cm/prebuilt/common/bin/otasigcheck.sh:install/bin/otasigcheck.sh + vendor/replicant/prebuilt/common/bin/otasigcheck.sh:install/bin/otasigcheck.sh # init.d support PRODUCT_COPY_FILES += \ - vendor/cm/prebuilt/common/etc/init.d/00banner:system/etc/init.d/00banner \ - vendor/cm/prebuilt/common/bin/sysinit:system/bin/sysinit + vendor/replicant/prebuilt/common/etc/init.d/00banner:system/etc/init.d/00banner \ + vendor/replicant/prebuilt/common/bin/sysinit:system/bin/sysinit ifneq ($(TARGET_BUILD_VARIANT),user) # userinit support PRODUCT_COPY_FILES += \ - vendor/cm/prebuilt/common/etc/init.d/90userinit:system/etc/init.d/90userinit + vendor/replicant/prebuilt/common/etc/init.d/90userinit:system/etc/init.d/90userinit endif # CM-specific init file PRODUCT_COPY_FILES += \ - vendor/cm/prebuilt/common/etc/init.local.rc:root/init.cm.rc + vendor/replicant/prebuilt/common/etc/init.local.rc:root/init.cm.rc # Copy over added mimetype supported in libcore.net.MimeUtils PRODUCT_COPY_FILES += \ - vendor/cm/prebuilt/common/lib/content-types.properties:system/lib/content-types.properties + vendor/replicant/prebuilt/common/lib/content-types.properties:system/lib/content-types.properties + +# Prebuilt apps +PRODUCT_COPY_FILES += \ + vendor/replicant/prebuilt/common/apps/FDroid.apk:system/app/FDroid.apk # Enable SIP+VoIP on all targets PRODUCT_COPY_FILES += \ @@ -118,16 +122,16 @@ PRODUCT_COPY_FILES += \ # This is CM! PRODUCT_COPY_FILES += \ - vendor/cm/config/permissions/com.cyanogenmod.android.xml:system/etc/permissions/com.cyanogenmod.android.xml + vendor/replicant/config/permissions/com.cyanogenmod.android.xml:system/etc/permissions/com.cyanogenmod.android.xml # Include CM audio files include vendor/cm/config/cm_audio.mk # Theme engine -include vendor/cm/config/themes_common.mk +include vendor/replicant/config/themes_common.mk # CMSDK -include vendor/cm/config/cmsdk_common.mk +include vendor/replicant/config/cmsdk_common.mk # Required CM packages PRODUCT_PACKAGES += \ @@ -148,17 +152,15 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ librsjni -# Custom CM packages +# Custom packages PRODUCT_PACKAGES += \ Launcher3 \ Trebuchet \ AudioFX \ - CMWallpapers \ + ReplicantWallpapers \ CMFileManager \ Eleven \ LockClock \ - CMUpdater \ - CyanogenSetupWizard \ CMSettingsProvider \ ExactCalculator \ LiveLockScreenService \ @@ -254,97 +256,34 @@ endif PRODUCT_PROPERTY_OVERRIDES += \ persist.sys.root_access=0 -DEVICE_PACKAGE_OVERLAYS += vendor/cm/overlay/common - -PRODUCT_VERSION_MAJOR = 13 -PRODUCT_VERSION_MINOR = 0 -PRODUCT_VERSION_MAINTENANCE := 4 +DEVICE_PACKAGE_OVERLAYS += vendor/replicant/overlay/common -ifeq ($(TARGET_VENDOR_SHOW_MAINTENANCE_VERSION),true) - CM_VERSION_MAINTENANCE := $(PRODUCT_VERSION_MAINTENANCE) +ifeq ($(USE_OPENGL_RENDERER),true) +PRODUCT_PACKAGE_OVERLAYS += vendor/replicant/overlay/opengl else - CM_VERSION_MAINTENANCE := 0 -endif - -# Set CM_BUILDTYPE from the env RELEASE_TYPE, for jenkins compat - -ifndef CM_BUILDTYPE - ifdef RELEASE_TYPE - # Starting with "CM_" is optional - RELEASE_TYPE := $(shell echo $(RELEASE_TYPE) | sed -e 's|^CM_||g') - CM_BUILDTYPE := $(RELEASE_TYPE) - endif -endif +BOARD_EGL_CFG := vendor/replicant/prebuilt/softwaregl/configs/egl.cfg -# Filter out random types, so it'll reset to UNOFFICIAL -ifeq ($(filter RELEASE NIGHTLY SNAPSHOT EXPERIMENTAL,$(CM_BUILDTYPE)),) - CM_BUILDTYPE := -endif +PRODUCT_PROPERTY_OVERRIDES += ro.softwaregl=1 +# use Android's software renderer by default +PRODUCT_PROPERTY_OVERRIDES += ro.libagl=1 -ifdef CM_BUILDTYPE - ifneq ($(CM_BUILDTYPE), SNAPSHOT) - ifdef CM_EXTRAVERSION - # Force build type to EXPERIMENTAL - CM_BUILDTYPE := EXPERIMENTAL - # Remove leading dash from CM_EXTRAVERSION - CM_EXTRAVERSION := $(shell echo $(CM_EXTRAVERSION) | sed 's/-//') - # Add leading dash to CM_EXTRAVERSION - CM_EXTRAVERSION := -$(CM_EXTRAVERSION) - endif - else - ifndef CM_EXTRAVERSION - # Force build type to EXPERIMENTAL, SNAPSHOT mandates a tag - CM_BUILDTYPE := EXPERIMENTAL - else - # Remove leading dash from CM_EXTRAVERSION - CM_EXTRAVERSION := $(shell echo $(CM_EXTRAVERSION) | sed 's/-//') - # Add leading dash to CM_EXTRAVERSION - CM_EXTRAVERSION := -$(CM_EXTRAVERSION) - endif - endif -else - # If CM_BUILDTYPE is not defined, set to UNOFFICIAL - CM_BUILDTYPE := UNOFFICIAL - CM_EXTRAVERSION := +PRODUCT_PACKAGE_OVERLAYS += vendor/replicant/overlay/softwaregl endif -ifeq ($(CM_BUILDTYPE), UNOFFICIAL) - ifneq ($(TARGET_UNOFFICIAL_BUILD_ID),) - CM_EXTRAVERSION := -$(TARGET_UNOFFICIAL_BUILD_ID) - endif -endif +PRODUCT_VERSION_MAJOR = 6 +PRODUCT_VERSION_MINOR = 0 +PRODUCT_VERSION_MAINTENANCE = 1 -ifeq ($(CM_BUILDTYPE), RELEASE) - ifndef TARGET_VENDOR_RELEASE_BUILD_ID - CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(CM_BUILD) - else - ifeq ($(TARGET_BUILD_VARIANT),user) - ifeq ($(CM_VERSION_MAINTENANCE),0) - CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(CM_BUILD) - else - CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(CM_VERSION_MAINTENANCE)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(CM_BUILD) - endif - else - CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(CM_BUILD) - endif - endif -else - ifeq ($(CM_VERSION_MAINTENANCE),0) - CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(shell date -u +%Y%m%d)-$(CM_BUILDTYPE)$(CM_EXTRAVERSION)-$(CM_BUILD) - else - CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(CM_VERSION_MAINTENANCE)-$(shell date -u +%Y%m%d)-$(CM_BUILDTYPE)$(CM_EXTRAVERSION)-$(CM_BUILD) - endif -endif +REPLICANT_VERSION := "replicant-6.0" PRODUCT_PROPERTY_OVERRIDES += \ - ro.cm.version=$(CM_VERSION) \ - ro.cm.releasetype=$(CM_BUILDTYPE) \ - ro.modversion=$(CM_VERSION) \ - ro.cmlegal.url=https://cyngn.com/legal/privacy-policy + ro.cm.version=$(REPLICANT_VERSION) \ + ro.modversion=$(REPLICANT_VERSION) -include vendor/cm-priv/keys/keys.mk -CM_DISPLAY_VERSION := $(CM_VERSION) +CM_VERSION := $(REPLICANT_VERSION) +CM_DISPLAY_VERSION := $(REPLICANT_VERSION) ifneq ($(PRODUCT_DEFAULT_DEV_CERTIFICATE),) ifneq ($(PRODUCT_DEFAULT_DEV_CERTIFICATE),build/target/product/security/testkey) diff --git a/config/common_full.mk b/config/common_full.mk index 57420b5..1e07256 100644 --- a/config/common_full.mk +++ b/config/common_full.mk @@ -1,14 +1,17 @@ # Inherit common CM stuff -$(call inherit-product, vendor/cm/config/common.mk) +$(call inherit-product, vendor/replicant/config/common.mk) PRODUCT_SIZE := full -# Optional CM packages +ifeq ($(USE_OPENGL_RENDERER),true) PRODUCT_PACKAGES += \ Galaxy4 \ HoloSpiralWallpaper \ LiveWallpapers \ - MagicSmokeWallpapers \ + MagicSmokeWallpapers +endif + +PRODUCT_PACKAGES += \ NoiseField \ PhaseBeam \ PhotoTable \ diff --git a/config/common_full_phone.mk b/config/common_full_phone.mk index 6ee8c00..222e944 100644 --- a/config/common_full_phone.mk +++ b/config/common_full_phone.mk @@ -1,16 +1,16 @@ # Inherit common CM stuff -$(call inherit-product, vendor/cm/config/common_full.mk) +$(call inherit-product, vendor/replicant/config/common_full.mk) # Required CM packages PRODUCT_PACKAGES += \ LatinIME # Include CM LatinIME dictionaries -PRODUCT_PACKAGE_OVERLAYS += vendor/cm/overlay/dictionaries +PRODUCT_PACKAGE_OVERLAYS += vendor/replicant/overlay/dictionaries ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space)) PRODUCT_COPY_FILES += \ - vendor/cm/prebuilt/common/bootanimation/480.zip:system/media/bootanimation.zip + vendor/replicant/prebuilt/common/bootanimation/vertical-480x800.zip:system/media/bootanimation.zip endif -$(call inherit-product, vendor/cm/config/telephony.mk) +$(call inherit-product, vendor/replicant/config/telephony.mk) diff --git a/config/common_full_tablet_wifionly.mk b/config/common_full_tablet_wifionly.mk index 8dc9332..5bcbcf1 100644 --- a/config/common_full_tablet_wifionly.mk +++ b/config/common_full_tablet_wifionly.mk @@ -1,5 +1,5 @@ # Inherit common CM stuff -$(call inherit-product, vendor/cm/config/common_full.mk) +$(call inherit-product, vendor/replicant/config/common_full.mk) # Required CM packages PRODUCT_PACKAGES += \ @@ -10,5 +10,5 @@ PRODUCT_PACKAGE_OVERLAYS += vendor/cm/overlay/dictionaries ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space)) PRODUCT_COPY_FILES += \ - vendor/cm/prebuilt/common/bootanimation/800.zip:system/media/bootanimation.zip + vendor/replicant/prebuilt/common/bootanimation/horizontal-1280x800.zip:system/media/bootanimation.zip endif diff --git a/config/common_mini_phone.mk b/config/common_mini_phone.mk index 828b5b9..4700b14 100644 --- a/config/common_mini_phone.mk +++ b/config/common_mini_phone.mk @@ -1,4 +1,4 @@ -$(call inherit-product, vendor/cm/config/common_mini.mk) +$(call inherit-product, vendor/replicant/config/common_mini.mk) # Required CM packages PRODUCT_PACKAGES += \ @@ -6,7 +6,7 @@ PRODUCT_PACKAGES += \ ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space)) PRODUCT_COPY_FILES += \ - vendor/cm/prebuilt/common/bootanimation/320.zip:system/media/bootanimation.zip + vendor/replicant/prebuilt/common/bootanimation/vertical-320x480.zip:system/media/bootanimation.zip endif $(call inherit-product, vendor/cm/config/telephony.mk) diff --git a/config/common_mini_tablet_wifionly.mk b/config/common_mini_tablet_wifionly.mk index 1d5810f..fa00a63 100644 --- a/config/common_mini_tablet_wifionly.mk +++ b/config/common_mini_tablet_wifionly.mk @@ -1,5 +1,5 @@ # Inherit common CM stuff -$(call inherit-product, vendor/cm/config/common_mini.mk) +$(call inherit-product, vendor/replicant/config/common_mini.mk) # Required CM packages PRODUCT_PACKAGES += \ @@ -7,5 +7,5 @@ PRODUCT_PACKAGES += \ ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space)) PRODUCT_COPY_FILES += \ - vendor/cm/prebuilt/common/bootanimation/800.zip:system/media/bootanimation.zip + vendor/replicant/prebuilt/common/bootanimation/horizontal-1024x600.zip:system/media/bootanimation.zip endif diff --git a/config/nfc_enhanced.mk b/config/nfc_enhanced.mk index d9ea102..63a9097 100644 --- a/config/nfc_enhanced.mk +++ b/config/nfc_enhanced.mk @@ -1,3 +1,3 @@ # This device supports CM enhanced NFC PRODUCT_COPY_FILES += \ - vendor/cm/config/permissions/com.cyanogenmod.nfc.enhanced.xml:system/etc/permissions/com.cyanogenmod.nfc.enhanced.xml + vendor/replicant/config/permissions/com.cyanogenmod.nfc.enhanced.xml:system/etc/permissions/com.cyanogenmod.nfc.enhanced.xml diff --git a/config/telephony.mk b/config/telephony.mk index 2503125..39a2ff8 100644 --- a/config/telephony.mk +++ b/config/telephony.mk @@ -1,6 +1,6 @@ # World APN list PRODUCT_COPY_FILES += \ - vendor/cm/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml + vendor/replicant/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml # Telephony packages PRODUCT_PACKAGES += \ |