lineage: Complete the rebrand

* TODO: Rebrand cmsdk when it's in a working state

Change-Id: I0d8d573f9e0032110ae3a0f54ebe11a877b83137
This commit is contained in:
Luca Stefani
2017-08-17 19:28:48 +02:00
committed by Michael Bestas
parent 91f7620c4d
commit 5c60e4fd24
35 changed files with 186 additions and 575 deletions

View File

@@ -1,375 +0,0 @@
LineageOS
===============
Visit http://github.com/LineageOS for full source and git access.
Visit http://review.lineageos.org for our Gerrit instance.
CHANGELOG (notable new features)
---------
### 13.0 ZNH5Y
* Common: Android 6.0.1 (Google)
* Android Security Bulletin - August 1st update
* Wi-Fi Tethering automatically turn off hotspot after X minutes of inactivity
* Profiles add notification light controls
* Do Not Disturb/Priority Mode add notification light controls
* Privacy Guard/App data usage Restrict apps to Wi-Fi or Cellular data only or block all internet access, per app
* Bluetooth Devices battery support
* Lockscreen Wallpaper picker makes its return
* Lockscreen Weather and new Weather plug in support
* Lockscreen Blur support (on a per device basis) and the ability to disable the effect
* Live Lockscreen support
* New LiveDisplay hardware enhancements and API
* Snap Camera (per device basis)
* Gello Browser (per device basis)
* Lots of translations
* Cyanogen Apps support (x86 not supported yet)
* Additional CM SDK APIs
* Security fixes galore
### 13.0 ZNH0E
* Common: Android 6.0.1 (Google)
* Android Security Bulletin - March 7th update
* Settings > Build date - Triple tap to access demo mode
* Settings > Memory - New screen to show memory usage over a selected period of time
* Protected Apps - New folder UX, fingerprint support, enhanced ability to restrict access
* New SMS/MMS application
### 12.1 YOG4PAO3
* Common: Android 5.1.1 (Google)
* Android Security Bulletin October 5th update
### 12.1 YOG4PAO2
* Common: Android 5.1.1 (Google)
* New Devices: Andromax Q (rendang), Galaxy S5 China (kltechn), Galaxy S5 Duos (klteduos), Galaxy S5 Duos China (kltechnduo)
* IMAP idle support
* SDK v1 release
* Stagefright security fixes
### 12.0
* Common: Android 5.0 (Google)
### 11.0.0 M12
* Common: Android 4.4.4 (Google)
* patches against POODLE vulnerability in SSLv3
* Multi-sim improvements throughout the OS experience
### 11.0.0 M11
* Common: Android 4.4.4 (Google)
* New Devices: Galaxy S4 Active (jactivelte), Galaxy S4 SK I-9506 (ks01lte), Galaxy S5 GSM (klte), Galaxy Tab 10.1 (picassowifi), Galaxy Player 4.0 (ypg1)
* Re-introduce Samsung Galaxy Relay 4G (apexqtmo) support
* Fix signal strength showing 2147483647 on certain devices
* Frameworks & Core Apps: CAF and other upstream updates
* Lockscreen: Do not play sounds while a phone call is active & MSIM updates
* Frameworks: Add base & MSIM APIs for SEEK (Secure Element Evaluation Kit) support
* Frameworks: Fix volume button changing two steps per click
* Frameworks: Add Screen Off action for double-tap/long-press configuration options
* Show devices connected to your WiFi (tethering) Hotspot
* Fix bug related to switch to last app action while in Recents view
* Fix Navigation Bar arrow keys in RTL locales
* Translations updates from CyanogenMod CrowdIn team
* Adjustments to Glove Mode (High Touch Sensitivity)
* APN Updates for various regions
* Camera: Add support for all available Slow Shutter speeds (hardware dependent); Improve shutter button
* Dialer/InCallUI: Fix smartcover always showing answer fragment
* LG G2: Address GPS and NFC issues
* Base support for HTC Desire 816 & HTC One Mini 2 (pending nightlies)
* Various security updates
* General bug fixes
### 11.0.0 M10
* Common: Android 4.4.4 (Google)
* New Devices: Galaxy S5 Sprint (kltespr)
* Split out Note 3 into GSM (hlte), Sprint (hltespr) and Verizon (hltevzw)
* Refactor moto_msm8960dt as 'ghost' for Moto X 2013
* Drop support for obake, toro, toroplus
* Theme Engine: Themes support for additional UI elements
* Frameworks & Core Apps: CAF and other upstream updates
* Settings: Add scramble pin feature
* Frameworks: Long press recent apps to switch to last used app
* Settings: Add soft reboot option
* Add smart cover support
* Add glove mode support
* Add bug reporter and crash log uploader
* Multisim updates
* General bug fixes
* ANT+ Support for various hardware
* Privacy Guard: Control NFC permissions
### 11.0.0 M9
* Common: Android 4.4.4 (Google)
* New Devices: Sony Xperia Z2 Tablets (castor); HTC One (m8)
* Theme Engine: Themes support for additional UI elements
* Lockscreen: Allow doubletap to sleep when using secure keyguard
* Settings: Safe Headset Volume prompt when interfering with 3rd party device (Jawbone, Square, etc)
* Settings: Center clock support
* Settings: Proximity Wake-Up support
* Settings: Spam notification filtering
* Settings Search: Additional improvements and highlighting
* Data Usage Info: Add support for CDMA devices without sim cards
* Bluetooth: Add additional A2DP profiles
* Bluetooth: Disable AVRCP 1.5 by default (fixes various car unit compatibility)
* Email: Fix saving attachments to storage for POP3 accounts
* Account for Play Services induced wake-locks
* Fix encryption on some LG Devices
* Dialer: add support for Korean and Chinese to smart-dialer
### 11.0.0 M8
* Common: Android 4.4.4 (Google)
* New Devices: Sony Xperia Z2 (sirius); Xiaomi Mi2 (aries); Oppo Find 7a/s (find7); OnePlus One (bacon)
* Common: Fix VPN issues related to 4.4.3 merge
* Common: Enable 'Heads Up' notification mode (Settings > Notifications)
* Settings: 'Interface' replaced by 'Status Bar', 'Notification Drawer', and 'Gestures'
* Settings: Moved 'Expanded Desktop' to 'Display'
* Settings: Moved all lock screen related items to 'Lock Screen' and removed duplicates from 'Security'
* Settings: Moved 'Navigation Bar' layout control to 'Buttons'
* Trebuchet: Custom Homescreen grid size
* Trebuchet: Add Protected Apps feature
* Trebuchet: Add Search Panel (Google Now) option
* WhisperPush: No longer ignores 'Blacklist'
* Futex: Protect against Towelroot
* Various small bugfixes, global and device-specific
### 11.0.0 M7
* Common: Android 4.4.2 (Google)
* New Devices: HTC One (m8); Samsung Galaxy Tab Pro 8.4 (mondrianwifi); Galaxy Note 8.0 LTE (n5120); LG G2 Docomo (l01f)
* Common: Theme Chooser UI Overhaul
* Common: Calculator app redesign (courtesy Xlythe)
* Common: Performance Profiles
* Common: Improved theming performance on low memory devices (~512MB RAM or less)
* Trebuchet: Move settings to new slide-out panel
* Trebuchet: Consolidate settings for home and drawer options
* Media: Add FFMPEG support (expanded media format support)
* Bluetooth: Improved support for new car audio systems and docks
* Various small bugfixes, global and device-specific
### 10.2.0
* Common: Android 4.3 (Google)
* Common: Privacy Guard 2.0 with AppOps
* Common: Quick Settings Ribbon (replaces Notification Power Widgets)
* Common: Hardware Tunables HAL
* Common: Settings restructure
* SMS: Voice+ (Google Voice integration)
* SMS: Middleware layer
* APN: World Phone Support (unified APN list)
* Trebuchet: Universal Icon Pack support
* Various small bugfixes, global and device-specific
### 10.1.3
* Common: CyanogenMod Account
* Common: Privacy Guard
* Common: Dialer blacklists
* Common: Wake-on-Home
* Common: QuickSettings camera
* Common: Profile improvements
* Various small bugfixes, global and device-specific
### 10.1.2
* Master Key #2 fix
### 10.1.1
* Master Key #1 fix
### 10.1.0
* Common: Android 4.2.2 (Google)
* Common: cLock Lockscreen and Homescreen Widget
* Common: Theme Engine Support
* Common: Customize Navigation Bar (on devices without hardware keys)
* Common: Customize Notification Light
* Common: Display Battery Light
* Common: Profiles with NFC support
* Common: Customize Screen Rotation
* Common: Notification Power Widgets
* Common: DSP Manager
* Common: Volume Rocker Wake
* Common: Performance Settings (I/O Scheduler, CPU Governor, etc)
* Quick Settings: Panel Customization
* Quick Settings: Toggle QS panel with horizontal swipe
* Quick Settings: Split QS actionable area
* Quick Settings: Added QS Tiles
* Status Bar: Hide or Show Clock
* Status Bar: Battery Percentage and Circle Battery
* Status Bar: Show Notification Counts
* Status Bar: Signal Status Customization
* Status Bar: Set Date and Time as buttons (with longpress actions)
* Trebuchet: Launcher Updates
* Lockscreen: Slider Shortcuts
* Lockscreen: Maximize Widgets on Wake
### 10.0.0
* Common: Android 4.1.2 (Google)
### 9.0.0
* Common: Android 4.0.4 (Google)
### 7.1.0
* Common: Android 2.3.7 (Google)
* Common: Bluetooth mouse support - Scott Brady
* Common: Improve notification swipe-to-clear - Evan Charlton
* Common: Improve album-artist support in media scanner - Paul Crovella
* Common: Profile improvements and bugfixes - Martin Long, Danny Baumann, Robert Burns
* Common: RTL text improvements - Eyad Aboulouz, Eran Mizrahi
* Common: Wake on volume key option - Sven Dawitz
* Common: Support for revoking application permissions - Plamen K. Kosseff
* Common: Latest Superuser app - ChainsDD
* Common: Control brightness by sliding on statusbar - Danesh M
* Common: Add "copy all" to context menu - Danesh M
* Common: Lockscreen haptic and statusbar indicators toggle - Danesh M
* Common: Nicer timepicker/datepicker - Jiri Tyr
* Common: Configuration 0/90/180/270 rotation - Jonas Larsson, Scott Brady
* Common: DSP Manager bugfixes and improvements - Antti S Lankila
* Common: Support for launching apps via gestures in the background - Jiri Tyr
* Common: Option to hide hold button during call - Roberto Leinardi
* Common: Allow using wildcards for call blacklisting - Nihanth Subramanya
* Common: Option to allow in-call lockscreen to match main lockscren - Sven Dawitz
* Common: Option to notify about incoming call only in background when screen is on - Pavel Kucera
* Common: ADWLauncher- Transitions, catalog improvements, bugfixes - John Van Etten
* Common: Optional GMT correction for SMS/MMS timestamps - Terry Hau
* Common: Add FM Seek for TI devices - KalimochoAz
* Common: Add FM support for SI4708 devices (Blade, V9, Racer) - Stéphane Konstantaropoulos
* Common: Add FM seek implementation to FM application - Tom Giordano
* Common: Show current FM status on lockscreen - Tom Giordano
* Common: Camera touch-to-focus - cyanogen, arcee, m0viefreak, Danny Baumann
* Common: Screenshot feature via power menu - arcee
* Common: WEBP backport - Vikas Arora
* Common: Add CM copyright noticies - arcee
* Common: Skia/Zlib/libcore ARM optimizations - 0xlab
* Common: Bluetooth tethering - Stéphane Konstantaropoulos
* Common: Lockscreen widget alignment - Danesh Mondegarian
* Common: Lockscreen calendar - David Morgan
* Common: AVRCP 1.3 support - Qualcomm (bugfix by Danny Baumann)
* Common: LED notification overhaul - Danny Baumann
* Common: System-wide DNS cache - Google, SEMC
* Common: Headset icon toggle - Cameron Pickett
* Common: FM seek support - Emilio López, Tom Giordano
* Common: Editable event fields in Contacts app - Danny Baumann
* Common: Remove compromised CA from system certs - Guardian Project
* Common: Mute camera shutter option - George Maizel
* Common: Camera timer - Danesh Mondegarian
* Common: "Mark all read" option in MMS - Vinod Surendran
* Common: "eat" pushes fresh brunch/breakfast to device - Ricardo Cerqueira
* Common: Customizable account color chip in Email - copolii
* Common: "Rings" lockscreen - Valera Trubachev
* Click, Motorola: Speed up photo recording - Emilio López
* Click, Motorola: Add Geolocation to photo app - KalimochoAz
* Click: Upgraded kernel from HTC 2.6.29 to 2.6.35
* HTC msm7x30: 2.6.35 kernel and updated userspace
* Buzz: 2.6.35 kernel - Arne Coucheron
* Bravo(c)/Vivo(w)/Ace/Liberty: On charge notification led - Richard Antony Burton
* Crespo/Crespo4G: Kernel update 2.6.35.14 and more, voodoo implementation, BLN, BLX...
* Encore: Update kernel from 2.6.29 to 2.6.32 - Dalingrin,Fattire,Verygreen
* Encore: New GPU drivers and userspace libs
* Encore: Adjustable clockspeed and voltage - Dalingrin
* Encore: Backport 2.6.35 Bluetooth - Fattire
* Encore: Working mem sleep
* Encore: USB host support - Verygreen
### 7.0.3
* Common: Don't allow packages with platform keys on user-controlled storage
### 7.0.2
* Common: Fix issue with missing built-in themes
* Common: Update bundled ROM Manager to latest version
* Supersonic: Actually fix GPS
* Supersonic: Fix proximity and light sensor
### 7.0.1
* Common: Fix fling velocity of status bar and ADW swipe - Sven Dawitz
* Common: Fixed webview layout bug (issue 3229) - Zinx
* Common: Fix GVoice-opens-twice bug - Zinx
* Common: Fix issues on all devices with DNS resolution failure after some time - Zinx, various
* Common: RTL improvements - Eran Mizrahi, Eyad Aboulouz
* Common: Fix crashes in Arabic locale - Eyad Aboulouz
* Common: Add Arabic keylayout - Eyad Aboulouz
* Common: Improve ADWLauncher scrolling/zoom performance - Pavel Kucera
* Common: Fix excessive memory use when appending to textviews - Cyanogen
* Common: New wallpapers from the CM community (CC License, see app for credits)
* Common: Option to disable vibration while in-call - Evan Charlton
* Common: Add long press option to status bar widgets for settings - Alex Avance
* Common: Compact carrier and status bar tweaks - Nihanth Subramanya, rorifree
* Sholes: Fix connectivity loss bug - cvpcs
* Speedy: Fix keyboard lights - JD Horelick
* Glacier: Fix backlights - Zinx
* Glacier: fix GPS issues - Zinx/QCom
* msm7x30: Fix bugs during video resume - Zinx
* qsd8x50: Fix 720p video playback
* qsd8x50: Unified 2.6.37 kernel - Cyanogen, toastcfh, slayher
* Espresso, Legend: WiFi fix (HTC)
* Supersonic: Fix GPS issues (HTC)
* msm7227: Fix GPS issues - Alex Hofbauer
* Click: Fix recovery kernel and compilation. Now works well with latest code - KalimochoAz
* Click: Speed up internet connection - KalimochoAz
* Blade: Update kernel to match Gen2 Radio - kallt_kaffe
* Blade: Update libaudio to fix SIP audio routing and microphone mute - Tom Giordano
### 7.0.0
* Common: Android 2.3.3 (Gingerbread) - Google
* Common: Fixes and changes from AOSP master - Various
* Common: ClockworkMod Recovery 3.0: Koush, Cyanogen, Zinx
* Common: Themes engine - T-Mobile
* Common: Performance enhancements for Qualcomm hardware - Code Aurora
* Common: New boot animation - 73v1n - http://www.youtube.com/watch?v=mYXiKWwp0DQ
* Common: Fix readahead values for NAND/MMC devices
* Common: Revamped notification widget - cvpcs
* Common: Updated various graphics for GB style - blunden
* Common: DSPManager updated for 2.3 - alankila
* Common: Restyled music app and forward-port of features - Jason Asher
* Common: Rotary answer in Phone app - James Peterson
* Common: BT VoiceDialer fixes - Matthew Sparby
* Common: Calendar enhancements - James Peterson
* Common: Stagefright fixes for 7x30, 8x50, and 7x27 - Zinx, arcee, Cyanogen
* Common: Pacman package manager - Kmobs
* Common: Workaround for unknown phone number - Jiri Tyr
* Common: Trackball answer/hangup - Juan Rodriguez
* Common: CMParts reorganization - Robert Burns
* Common: View ChangeLog via CMParts (System) - Wes Garner
* Common: Optional screen on/off animations - Diogo Ferreira
* Common: New browser incognito mode - optedoblivion
* Common: New trackball/trackpad wake - Zinx, Cyanogen
* Common: Legacy sensor/GPS support - arcee
* Common: Enabled v8 javascript engine on armv6 (msm7227/msm7225) - arcee
* Common: Customizable overscroll - arcee
* Common: Torch cleanup - defer
* Common: 2D compositor backwards compatibility - arcee
* Common: OpenGL backwards compatibility - Zinx, Cyanogen, Sileht, ezterry
* Common: SMS templates using gestures - Riccardo Ciovati
* Common: Phone Goggles - David Bidorff
* Common: Option to always show battery percentage on lockscreen - Robert Burns
* Common: Option to show music controls with compatible headset connection - Wes Garner
* Common: CPU frequency/scaling control in CMParts - Robert Ramiega
* Common: Option to pause/play music with camera button - cvpcs
* Common: Allow SIP User-Agent configuration - arcee
* Common (non-HTC): Fixed mobile connection suspension - arcee
* Common: New music widgets - Jason Asher
* Common: Updated FLAC support - cvpcs, Cyanogen, kroot
* Common: Updated wallpapers - Fitsnugly, Prash
* Common: Customizable search/long-press search - Sven Dawitz
* Common: New lockscreen styles - Rotary Revamped (default) and Lense - Sven Dawitz, Stefano Pignataro
* Common: Customizable app launcher on rotary lockscreen - Sven Dawitz
* Common: Now playing and album art on lockscreen - kmobs
* Common: GPS fixes - CodeAurora, arcee
* Common: Breakfast/Brunch - arcee
* Common: Statusbar battery percentage with mini icon - Sven Dawitz, design by Jazz Kalsi
* Common: SMS split for braindead carriers - Mike Wielgosz
* Common: MMS user-defined custom vibrate - Wes Garner
* Common: CMParts cleanup - Sven Dawitz
* Common: Notification profiles - Martin Long
* Common: TI wl12xx FM radio reverse engineering - Michael A. Reid
* Common: Tablet tweaks - Sven Dawitz
* Common: Revamped CMStats - Chris Soyars
* Common: Improved RTL text support and fonts - Eyad Aboulouz, Eran Mizrahi,
* Espresso/Legend: Enabled native WiFi tethering - Cyanogen, OMAPZoom.org
* Legend/Liberty/Buzz/Click: Enabled FM Radio - Alexander Hofbauer (libaudio patch)
* Z71: Enabled MPEG4/AAC video recording - arcee
* Z71: Enabled native WiFi tethering - arcee
* Passion/Bravo/BravoC/Supersonic/Inc: Kernel 2.6.37 - Google, Cyanogen, defer, Kali-, toastcfh, slayher
* Vision/Glacier/Espresso: WiFi calling compatibility and optimization - Zinx
* Vision/Glacier/Ace: Unified kernel - HTC, Cyanogen, Zinx, Kali-, defer
* Vision/Glacier/Ace: Fix FM radio on 2.3 - Zinx
* Vision/Glacier/Ace: Fixes for video overlay - Zinx, CodeAurora
* Vision: Only install WiFi calling on TMUS devices - attn1
* Espresso/Legend/Liberty: Unified kernel - HTC, Cyanogen, attn1, jznomoney, Alexander Hofbauer
* Supersonic: WiMAX support - HTC, Shinzul, toastcfh, shift, #teamwin, Cyanogen, Joey Conway
* Supersonic: HDMI mirror support: #teamwin
* ONE: Enabled native WiFi tethering - arcee

View File

@@ -9,9 +9,9 @@ You can do this by using these commands:
(From root android directory) (From root android directory)
. build/envsetup.sh . build/envsetup.sh
(Go to repo you are patching, make your changes and commit) (Go to repo you are patching, make your changes and commit)
cmgerrit <for(new)/changes(patch set)> <branch/change-id> lineagegerrit <for(new)/changes(patch set)> <branch/change-id>
repo start cm-14.1 . repo start lineage-15.0 .
(Make your changes and commit) (Make your changes and commit)
repo upload . repo upload .
Note: "." meaning current directory Note: "." meaning current directory
@@ -31,7 +31,7 @@ familiar with [Repo](https://source.android.com/source/using-repo.html) and [Ver
To initialize your local repository using the LineageOS trees, use a command like this: To initialize your local repository using the LineageOS trees, use a command like this:
repo init -u git://github.com/LineageOS/android.git -b cm-14.1 repo init -u git://github.com/LineageOS/android.git -b lineage-15.0
Then to sync up: Then to sync up:

View File

@@ -1,5 +1,5 @@
# #
#CM-specific variable clears # Lineage-specific variable clears
# #
LOCAL_IGNORE_SUBDIR := LOCAL_IGNORE_SUBDIR :=
@@ -13,4 +13,4 @@ LOCAL_MAVEN_POM :=
LOCAL_MAVEN_TARGET_MODULE := LOCAL_MAVEN_TARGET_MODULE :=
LOCAL_MAVEN_REPO_ID := LOCAL_MAVEN_REPO_ID :=
LOCAL_MAVEN_SOURCES := LOCAL_MAVEN_SOURCES :=
LOCAL_MAVEN_JAVADOC := LOCAL_MAVEN_JAVADOC :=

View File

@@ -1,5 +1,5 @@
# #
# CM-specific macros # Lineage-specific macros
# #
define uniq define uniq
$(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1))) $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1)))

View File

@@ -1,4 +1,4 @@
function __print_cm_functions_help() { function __print_lineage_functions_help() {
cat <<EOF cat <<EOF
Additional LineageOS functions: Additional LineageOS functions:
- cout: Changes directory to out. - cout: Changes directory to out.
@@ -7,9 +7,9 @@ Additional LineageOS functions:
- mmmp: Builds all of the modules in the supplied directories and pushes them to the device. - mmmp: Builds all of the modules in the supplied directories and pushes them to the device.
- mms: Short circuit builder. Quickly re-build the kernel, rootfs, boot and system images - mms: Short circuit builder. Quickly re-build the kernel, rootfs, boot and system images
without deep dependencies. Requires the full build to have run before. without deep dependencies. Requires the full build to have run before.
- cmgerrit: A Git wrapper that fetches/pushes patch from/to LineageOS Gerrit Review. - lineagegerrit: A Git wrapper that fetches/pushes patch from/to LineageOS Gerrit Review.
- cmrebase: Rebase a Gerrit change and push it again. - lineagerebase: Rebase a Gerrit change and push it again.
- cmremote: Add git remote for LineageOS Gerrit Review. - lineageremote: Add git remote for LineageOS Gerrit Review.
- aospremote: Add git remote for matching AOSP repository. - aospremote: Add git remote for matching AOSP repository.
- cafremote: Add git remote for matching CodeAurora repository. - cafremote: Add git remote for matching CodeAurora repository.
- mka: Builds using SCHED_BATCH on all processors. - mka: Builds using SCHED_BATCH on all processors.
@@ -40,7 +40,7 @@ function breakfast()
{ {
target=$1 target=$1
local variant=$2 local variant=$2
CM_DEVICES_ONLY="true" LINEAGE_DEVICES_ONLY="true"
unset LUNCH_MENU_CHOICES unset LUNCH_MENU_CHOICES
add_lunch_combo full-eng add_lunch_combo full-eng
for f in `/bin/ls vendor/lineage/vendorsetup.sh 2> /dev/null` for f in `/bin/ls vendor/lineage/vendorsetup.sh 2> /dev/null`
@@ -64,12 +64,7 @@ function breakfast()
variant="userdebug" variant="userdebug"
fi fi
if ! check_product lineage_$target && check_product cm_$target; then lunch lineage_$target-$variant
echo "** Warning: '$target' is using CM-based makefiles. This will be deprecated in the next major release."
lunch cm_$target-$variant
else
lunch lineage_$target-$variant
fi
fi fi
fi fi
return $? return $?
@@ -96,7 +91,7 @@ function eat()
done done
echo "Device Found.." echo "Device Found.."
fi fi
if (adb shell getprop ro.cm.device | grep -q "$CM_BUILD"); then if (adb shell getprop ro.lineage.device | grep -q "$LINEAGE_BUILD"); then
# if adbd isn't root we can't write to /cache/recovery/ # if adbd isn't root we can't write to /cache/recovery/
adb root adb root
sleep 1 sleep 1
@@ -112,7 +107,7 @@ EOF
fi fi
rm /tmp/command rm /tmp/command
else else
echo "The connected device does not appear to be $CM_BUILD, run away!" echo "The connected device does not appear to be $LINEAGE_BUILD, run away!"
fi fi
return $? return $?
else else
@@ -236,23 +231,23 @@ function dddclient()
fi fi
} }
function cmremote() function lineageremote()
{ {
if ! git rev-parse --git-dir &> /dev/null if ! git rev-parse --git-dir &> /dev/null
then then
echo ".git directory not found. Please run this from the root directory of the Android repository you wish to set up." echo ".git directory not found. Please run this from the root directory of the Android repository you wish to set up."
return 1 return 1
fi fi
git remote rm cmremote 2> /dev/null git remote rm lineage 2> /dev/null
GERRIT_REMOTE=$(git config --get remote.github.projectname) GERRIT_REMOTE=$(git config --get remote.github.projectname)
CMUSER=$(git config --get review.review.lineageos.org.username) LINEAGE_USER=$(git config --get review.review.lineageos.org.username)
if [ -z "$CMUSER" ] if [ -z "$LINEAGE_USER" ]
then then
git remote add cmremote ssh://review.lineageos.org:29418/$GERRIT_REMOTE git remote add lineage ssh://review.lineageos.org:29418/$GERRIT_REMOTE
else else
git remote add cmremote ssh://$CMUSER@review.lineageos.org:29418/$GERRIT_REMOTE git remote add lineage ssh://$LINEAGE_USER@review.lineageos.org:29418/$GERRIT_REMOTE
fi fi
echo "Remote 'cmremote' created" echo "Remote 'lineage' created"
} }
function aospremote() function aospremote()
@@ -319,7 +314,7 @@ function installboot()
sleep 1 sleep 1
adb wait-for-online shell mount /system 2>&1 > /dev/null adb wait-for-online shell mount /system 2>&1 > /dev/null
adb wait-for-online remount adb wait-for-online remount
if (adb shell getprop ro.cm.device | grep -q "$CM_BUILD"); if (adb shell getprop ro.lineage.device | grep -q "$LINEAGE_BUILD");
then then
adb push $OUT/boot.img /cache/ adb push $OUT/boot.img /cache/
if [ -e "$OUT/system/lib/modules/*" ]; if [ -e "$OUT/system/lib/modules/*" ];
@@ -333,7 +328,7 @@ function installboot()
adb shell dd if=/cache/boot.img of=$PARTITION adb shell dd if=/cache/boot.img of=$PARTITION
echo "Installation complete." echo "Installation complete."
else else
echo "The connected device does not appear to be $CM_BUILD, run away!" echo "The connected device does not appear to be $LINEAGE_BUILD, run away!"
fi fi
} }
@@ -367,13 +362,13 @@ function installrecovery()
sleep 1 sleep 1
adb wait-for-online shell mount /system 2>&1 >> /dev/null adb wait-for-online shell mount /system 2>&1 >> /dev/null
adb wait-for-online remount adb wait-for-online remount
if (adb shell getprop ro.cm.device | grep -q "$CM_BUILD"); if (adb shell getprop ro.lineage.device | grep -q "$LINEAGE_BUILD");
then then
adb push $OUT/recovery.img /cache/ adb push $OUT/recovery.img /cache/
adb shell dd if=/cache/recovery.img of=$PARTITION adb shell dd if=/cache/recovery.img of=$PARTITION
echo "Installation complete." echo "Installation complete."
else else
echo "The connected device does not appear to be $CM_BUILD, run away!" echo "The connected device does not appear to be $LINEAGE_BUILD, run away!"
fi fi
} }
@@ -393,13 +388,13 @@ function makerecipe() {
if [ "$REPO_REMOTE" = "github" ] if [ "$REPO_REMOTE" = "github" ]
then then
pwd pwd
cmremote lineageremote
git push cmremote HEAD:refs/heads/'$1' git push lineage HEAD:refs/heads/'$1'
fi fi
' '
} }
function cmgerrit() { function lineagegerrit() {
if [ "$(__detect_shell)" = "zsh" ]; then if [ "$(__detect_shell)" = "zsh" ]; then
# zsh does not define FUNCNAME, derive from funcstack # zsh does not define FUNCNAME, derive from funcstack
local FUNCNAME=$funcstack[1] local FUNCNAME=$funcstack[1]
@@ -445,7 +440,7 @@ EOF
case $1 in case $1 in
__cmg_*) echo "For internal use only." ;; __cmg_*) echo "For internal use only." ;;
changes|for) changes|for)
if [ "$FUNCNAME" = "cmgerrit" ]; then if [ "$FUNCNAME" = "lineagegerrit" ]; then
echo "'$FUNCNAME $1' is deprecated." echo "'$FUNCNAME $1' is deprecated."
fi fi
;; ;;
@@ -538,7 +533,7 @@ EOF
$local_branch:refs/for/$remote_branch || return 1 $local_branch:refs/for/$remote_branch || return 1
;; ;;
changes|for) changes|for)
if [ "$FUNCNAME" = "cmgerrit" ]; then if [ "$FUNCNAME" = "lineagegerrit" ]; then
echo >&2 "'$FUNCNAME $command' is deprecated." echo >&2 "'$FUNCNAME $command' is deprecated."
fi fi
;; ;;
@@ -637,7 +632,7 @@ EOF
esac esac
} }
function cmrebase() { function lineagerebase() {
local repo=$1 local repo=$1
local refs=$2 local refs=$2
local pwd="$(pwd)" local pwd="$(pwd)"
@@ -645,7 +640,7 @@ function cmrebase() {
if [ -z $repo ] || [ -z $refs ]; then if [ -z $repo ] || [ -z $refs ]; then
echo "LineageOS Gerrit Rebase Usage: " echo "LineageOS Gerrit Rebase Usage: "
echo " cmrebase <path to project> <patch IDs on Gerrit>" echo " lineagerebase <path to project> <patch IDs on Gerrit>"
echo " The patch IDs appear on the Gerrit commands that are offered." echo " The patch IDs appear on the Gerrit commands that are offered."
echo " They consist on a series of numbers and slashes, after the text" echo " They consist on a series of numbers and slashes, after the text"
echo " refs/changes. For example, the ID in the following command is 26/8126/2" echo " refs/changes. For example, the ID in the following command is 26/8126/2"
@@ -794,7 +789,7 @@ function dopush()
echo "Device Found." echo "Device Found."
fi fi
if (adb shell getprop ro.cm.device | grep -q "$CM_BUILD") || [ "$FORCE_PUSH" = "true" ]; if (adb shell getprop ro.lineage.device | grep -q "$LINEAGE_BUILD") || [ "$FORCE_PUSH" = "true" ];
then then
# retrieve IP and PORT info if we're using a TCP connection # retrieve IP and PORT info if we're using a TCP connection
TCPIPPORT=$(adb devices \ TCPIPPORT=$(adb devices \
@@ -912,7 +907,7 @@ EOF
rm -f $OUT/.log rm -f $OUT/.log
return 0 return 0
else else
echo "The connected device does not appear to be $CM_BUILD, run away!" echo "The connected device does not appear to be $LINEAGE_BUILD, run away!"
fi fi
} }
@@ -931,7 +926,7 @@ function repopick() {
function fixup_common_out_dir() { function fixup_common_out_dir() {
common_out_dir=$(get_build_var OUT_DIR)/target/common common_out_dir=$(get_build_var OUT_DIR)/target/common
target_device=$(get_build_var TARGET_DEVICE) target_device=$(get_build_var TARGET_DEVICE)
if [ ! -z $CM_FIXUP_COMMON_OUT ]; then if [ ! -z $LINEAGE_FIXUP_COMMON_OUT ]; then
if [ -d ${common_out_dir} ] && [ ! -L ${common_out_dir} ]; then if [ -d ${common_out_dir} ] && [ ! -L ${common_out_dir} ]; then
mv ${common_out_dir} ${common_out_dir}-${target_device} mv ${common_out_dir} ${common_out_dir}-${target_device}
ln -s ${common_out_dir}-${target_device} ${common_out_dir} ln -s ${common_out_dir}-${target_device} ${common_out_dir}

View File

@@ -6,7 +6,7 @@ ifeq ($(strip $(BOARD_KERNEL_SEPARATED_DT)),true)
ifneq ($(strip $(BOARD_KERNEL_PREBUILT_DT)),true) ifneq ($(strip $(BOARD_KERNEL_PREBUILT_DT)),true)
ifeq ($(strip $(TARGET_CUSTOM_DTBTOOL)),) ifeq ($(strip $(TARGET_CUSTOM_DTBTOOL)),)
DTBTOOL_NAME := dtbToolCM DTBTOOL_NAME := dtbToolLineage
else else
DTBTOOL_NAME := $(TARGET_CUSTOM_DTBTOOL) DTBTOOL_NAME := $(TARGET_CUSTOM_DTBTOOL)
endif endif
@@ -16,7 +16,7 @@ DTBTOOL := $(HOST_OUT_EXECUTABLES)/$(DTBTOOL_NAME)$(HOST_EXECUTABLE_SUFFIX)
INSTALLED_DTIMAGE_TARGET := $(PRODUCT_OUT)/dt.img INSTALLED_DTIMAGE_TARGET := $(PRODUCT_OUT)/dt.img
ifeq ($(strip $(TARGET_CUSTOM_DTBTOOL)),) ifeq ($(strip $(TARGET_CUSTOM_DTBTOOL)),)
# dtbToolCM will search subdirectories # dtbToolLineage will search subdirectories
possible_dtb_dirs = $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/ possible_dtb_dirs = $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/
else else
# Most specific paths must come first in possible_dtb_dirs # Most specific paths must come first in possible_dtb_dirs

View File

@@ -25,9 +25,9 @@ VENDOR=*** FILL IN VENDOR ****
MY_DIR="${BASH_SOURCE%/*}" MY_DIR="${BASH_SOURCE%/*}"
if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi
CM_ROOT="$MY_DIR"/../../.. LINEAGE_ROOT="$MY_DIR"/../../..
HELPER="$CM_ROOT"/vendor/lineage/build/tools/extract_utils.sh HELPER="$LINEAGE_ROOT"/vendor/lineage/build/tools/extract_utils.sh
if [ ! -f "$HELPER" ]; then if [ ! -f "$HELPER" ]; then
echo "Unable to find helper script at $HELPER" echo "Unable to find helper script at $HELPER"
exit 1 exit 1
@@ -57,7 +57,7 @@ if [ -z "$SRC" ]; then
fi fi
# Initialize the helper # Initialize the helper
setup_vendor "$DEVICE" "$VENDOR" "$CM_ROOT" false "$CLEAN_VENDOR" setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT" false "$CLEAN_VENDOR"
extract "$MY_DIR"/proprietary-files.txt "$SRC" "$SECTION" extract "$MY_DIR"/proprietary-files.txt "$SRC" "$SECTION"

View File

@@ -27,9 +27,9 @@ INITIAL_COPYRIGHT_YEAR=**** FILL IN COPYRIGHT YEAR ****
MY_DIR="${BASH_SOURCE%/*}" MY_DIR="${BASH_SOURCE%/*}"
if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi
CM_ROOT="$MY_DIR"/../../.. LINEAGE_ROOT="$MY_DIR"/../../..
HELPER="$CM_ROOT"/vendor/lineage/build/tools/extract_utils.sh HELPER="$LINEAGE_ROOT"/vendor/lineage/build/tools/extract_utils.sh
if [ ! -f "$HELPER" ]; then if [ ! -f "$HELPER" ]; then
echo "Unable to find helper script at $HELPER" echo "Unable to find helper script at $HELPER"
exit 1 exit 1
@@ -37,7 +37,7 @@ fi
. "$HELPER" . "$HELPER"
# Initialize the helper # Initialize the helper
setup_vendor "$DEVICE" "$VENDOR" "$CM_ROOT" setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT"
# Copyright headers and guards # Copyright headers and guards
write_headers write_headers

View File

@@ -45,7 +45,7 @@ trap cleanup EXIT INT TERM ERR
# #
# $1: device name # $1: device name
# $2: vendor name # $2: vendor name
# $3: CM root directory # $3: Lineage root directory
# $4: is common device - optional, default to false # $4: is common device - optional, default to false
# $5: cleanup - optional, default to true # $5: cleanup - optional, default to true
# $6: custom vendor makefile name - optional, default to false # $6: custom vendor makefile name - optional, default to false
@@ -66,15 +66,15 @@ function setup_vendor() {
exit 1 exit 1
fi fi
export CM_ROOT="$3" export LINEAGE_ROOT="$3"
if [ ! -d "$CM_ROOT" ]; then if [ ! -d "$LINEAGE_ROOT" ]; then
echo "\$CM_ROOT must be set and valid before including this script!" echo "\$LINEAGE_ROOT must be set and valid before including this script!"
exit 1 exit 1
fi fi
export OUTDIR=vendor/"$VENDOR"/"$DEVICE" export OUTDIR=vendor/"$VENDOR"/"$DEVICE"
if [ ! -d "$CM_ROOT/$OUTDIR" ]; then if [ ! -d "$LINEAGE_ROOT/$OUTDIR" ]; then
mkdir -p "$CM_ROOT/$OUTDIR" mkdir -p "$LINEAGE_ROOT/$OUTDIR"
fi fi
VNDNAME="$6" VNDNAME="$6"
@@ -82,9 +82,9 @@ function setup_vendor() {
VNDNAME="$DEVICE" VNDNAME="$DEVICE"
fi fi
export PRODUCTMK="$CM_ROOT"/"$OUTDIR"/"$VNDNAME"-vendor.mk export PRODUCTMK="$LINEAGE_ROOT"/"$OUTDIR"/"$VNDNAME"-vendor.mk
export ANDROIDMK="$CM_ROOT"/"$OUTDIR"/Android.mk export ANDROIDMK="$LINEAGE_ROOT"/"$OUTDIR"/Android.mk
export BOARDMK="$CM_ROOT"/"$OUTDIR"/BoardConfigVendor.mk export BOARDMK="$LINEAGE_ROOT"/"$OUTDIR"/BoardConfigVendor.mk
if [ "$4" == "true" ] || [ "$4" == "1" ]; then if [ "$4" == "true" ] || [ "$4" == "1" ]; then
COMMON=1 COMMON=1
@@ -678,15 +678,15 @@ function get_file() {
# Convert apk|jar .odex in the corresposing classes.dex # Convert apk|jar .odex in the corresposing classes.dex
# #
function oat2dex() { function oat2dex() {
local CM_TARGET="$1" local LINEAGE_TARGET="$1"
local OEM_TARGET="$2" local OEM_TARGET="$2"
local SRC="$3" local SRC="$3"
local TARGET= local TARGET=
local OAT= local OAT=
if [ -z "$BAKSMALIJAR" ] || [ -z "$SMALIJAR" ]; then if [ -z "$BAKSMALIJAR" ] || [ -z "$SMALIJAR" ]; then
export BAKSMALIJAR="$CM_ROOT"/vendor/lineage/build/tools/smali/baksmali.jar export BAKSMALIJAR="$LINEAGE_ROOT"/vendor/lineage/build/tools/smali/baksmali.jar
export SMALIJAR="$CM_ROOT"/vendor/lineage/build/tools/smali/smali.jar export SMALIJAR="$LINEAGE_ROOT"/vendor/lineage/build/tools/smali/smali.jar
fi fi
# Extract existing boot.oats to the temp folder # Extract existing boot.oats to the temp folder
@@ -706,11 +706,11 @@ function oat2dex() {
FULLY_DEODEXED=1 && return 0 # system is fully deodexed, return FULLY_DEODEXED=1 && return 0 # system is fully deodexed, return
fi fi
if [ ! -f "$CM_TARGET" ]; then if [ ! -f "$LINEAGE_TARGET" ]; then
return; return;
fi fi
if grep "classes.dex" "$CM_TARGET" >/dev/null; then if grep "classes.dex" "$LINEAGE_TARGET" >/dev/null; then
return 0 # target apk|jar is already odexed, return return 0 # target apk|jar is already odexed, return
fi fi
@@ -721,7 +721,7 @@ function oat2dex() {
if get_file "$OAT" "$TMPDIR" "$SRC"; then if get_file "$OAT" "$TMPDIR" "$SRC"; then
java -jar "$BAKSMALIJAR" deodex -o "$TMPDIR/dexout" -b "$BOOTOAT" -d "$TMPDIR" "$TMPDIR/$(basename "$OAT")" java -jar "$BAKSMALIJAR" deodex -o "$TMPDIR/dexout" -b "$BOOTOAT" -d "$TMPDIR" "$TMPDIR/$(basename "$OAT")"
elif [[ "$CM_TARGET" =~ .jar$ ]]; then elif [[ "$LINEAGE_TARGET" =~ .jar$ ]]; then
# try to extract classes.dex from boot.oats for framework jars # try to extract classes.dex from boot.oats for framework jars
JAROAT="$TMPDIR/system/framework/$ARCH/boot-$(basename ${OEM_TARGET%.*}).oat" JAROAT="$TMPDIR/system/framework/$ARCH/boot-$(basename ${OEM_TARGET%.*}).oat"
if [ ! -f "$JAROAT" ]; then if [ ! -f "$JAROAT" ]; then
@@ -809,7 +809,7 @@ function extract() {
local HASHLIST=( ${PRODUCT_COPY_FILES_HASHES[@]} ${PRODUCT_PACKAGES_HASHES[@]} ) local HASHLIST=( ${PRODUCT_COPY_FILES_HASHES[@]} ${PRODUCT_PACKAGES_HASHES[@]} )
local COUNT=${#FILELIST[@]} local COUNT=${#FILELIST[@]}
local SRC="$2" local SRC="$2"
local OUTPUT_ROOT="$CM_ROOT"/"$OUTDIR"/proprietary local OUTPUT_ROOT="$LINEAGE_ROOT"/"$OUTDIR"/proprietary
local OUTPUT_TMP="$TMPDIR"/"$OUTDIR"/proprietary local OUTPUT_TMP="$TMPDIR"/"$OUTDIR"/proprietary
if [ "$SRC" = "adb" ]; then if [ "$SRC" = "adb" ]; then
@@ -817,7 +817,7 @@ function extract() {
fi fi
if [ -f "$SRC" ] && [ "${SRC##*.}" == "zip" ]; then if [ -f "$SRC" ] && [ "${SRC##*.}" == "zip" ]; then
DUMPDIR="$CM_ROOT"/system_dump DUMPDIR="$LINEAGE_ROOT"/system_dump
# Check if we're working with the same zip that was passed last time. # Check if we're working with the same zip that was passed last time.
# If so, let's just use what's already extracted. # If so, let's just use what's already extracted.
@@ -837,7 +837,7 @@ function extract() {
# If OTA is block based, extract it. # If OTA is block based, extract it.
elif [ -a "$DUMPDIR"/system.new.dat ]; then elif [ -a "$DUMPDIR"/system.new.dat ]; then
echo "Converting system.new.dat to system.img" echo "Converting system.new.dat to system.img"
python "$CM_ROOT"/vendor/lineage/build/tools/sdat2img.py "$DUMPDIR"/system.transfer.list "$DUMPDIR"/system.new.dat "$DUMPDIR"/system.img 2>&1 python "$LINEAGE_ROOT"/vendor/lineage/build/tools/sdat2img.py "$DUMPDIR"/system.transfer.list "$DUMPDIR"/system.new.dat "$DUMPDIR"/system.img 2>&1
rm -rf "$DUMPDIR"/system.new.dat "$DUMPDIR"/system rm -rf "$DUMPDIR"/system.new.dat "$DUMPDIR"/system
mkdir "$DUMPDIR"/system "$DUMPDIR"/tmp mkdir "$DUMPDIR"/system "$DUMPDIR"/tmp
echo "Requesting sudo access to mount the system.img" echo "Requesting sudo access to mount the system.img"
@@ -897,14 +897,14 @@ function extract() {
local DEST="$OUTPUT_DIR/$FROM" local DEST="$OUTPUT_DIR/$FROM"
if [ "$SRC" = "adb" ]; then if [ "$SRC" = "adb" ]; then
# Try CM target first # Try Lineage target first
adb pull "/$TARGET" "$DEST" adb pull "/$TARGET" "$DEST"
# if file does not exist try OEM target # if file does not exist try OEM target
if [ "$?" != "0" ]; then if [ "$?" != "0" ]; then
adb pull "/$FILE" "$DEST" adb pull "/$FILE" "$DEST"
fi fi
else else
# Try CM target first # Try Lineage target first
if [ -f "$SRC/$TARGET" ]; then if [ -f "$SRC/$TARGET" ]; then
cp "$SRC/$TARGET" "$DEST" cp "$SRC/$TARGET" "$DEST"
# if file does not exist try OEM target # if file does not exist try OEM target
@@ -996,7 +996,7 @@ function extract_firmware() {
local FILELIST=( ${PRODUCT_COPY_FILES_LIST[@]} ) local FILELIST=( ${PRODUCT_COPY_FILES_LIST[@]} )
local COUNT=${#FILELIST[@]} local COUNT=${#FILELIST[@]}
local SRC="$2" local SRC="$2"
local OUTPUT_DIR="$CM_ROOT"/"$OUTDIR"/radio local OUTPUT_DIR="$LINEAGE_ROOT"/"$OUTDIR"/radio
if [ "$VENDOR_RADIO_STATE" -eq "0" ]; then if [ "$VENDOR_RADIO_STATE" -eq "0" ]; then
echo "Cleaning firmware output directory ($OUTPUT_DIR).." echo "Cleaning firmware output directory ($OUTPUT_DIR).."

View File

@@ -153,7 +153,7 @@ def is_in_manifest(projectpath):
# ... and don't forget the lineage snippet # ... and don't forget the lineage snippet
try: try:
lm = ElementTree.parse(".repo/manifests/snippets/cm.xml") lm = ElementTree.parse(".repo/manifests/snippets/lineage.xml")
lm = lm.getroot() lm = lm.getroot()
except: except:
lm = ElementTree.Element("manifest") lm = ElementTree.Element("manifest")
@@ -203,34 +203,29 @@ def add_to_manifest(repositories, fallback_branch = None):
def fetch_dependencies(repo_path, fallback_branch = None): def fetch_dependencies(repo_path, fallback_branch = None):
print('Looking for dependencies in %s' % repo_path) print('Looking for dependencies in %s' % repo_path)
dependencies_paths = [repo_path + '/lineage.dependencies', repo_path + '/cm.dependencies'] dependencies_path = repo_path + '/lineage.dependencies'
found_dependencies = False
syncable_repos = [] syncable_repos = []
verify_repos = [] verify_repos = []
for dependencies_path in dependencies_paths: if os.path.exists(dependencies_path):
if os.path.exists(dependencies_path): dependencies_file = open(dependencies_path, 'r')
dependencies_file = open(dependencies_path, 'r') dependencies = json.loads(dependencies_file.read())
dependencies = json.loads(dependencies_file.read()) fetch_list = []
fetch_list = []
for dependency in dependencies: for dependency in dependencies:
if not is_in_manifest(dependency['target_path']): if not is_in_manifest(dependency['target_path']):
fetch_list.append(dependency) fetch_list.append(dependency)
syncable_repos.append(dependency['target_path']) syncable_repos.append(dependency['target_path'])
verify_repos.append(dependency['target_path']) verify_repos.append(dependency['target_path'])
elif re.search("android_device_.*_.*$", dependency['repository']): elif re.search("android_device_.*_.*$", dependency['repository']):
verify_repos.append(dependency['target_path']) verify_repos.append(dependency['target_path'])
dependencies_file.close() dependencies_file.close()
found_dependencies = True
if len(fetch_list) > 0: if len(fetch_list) > 0:
print('Adding dependencies to manifest') print('Adding dependencies to manifest')
add_to_manifest(fetch_list, fallback_branch) add_to_manifest(fetch_list, fallback_branch)
break else:
if not found_dependencies:
print('Dependencies file not found, bailing out.') print('Dependencies file not found, bailing out.')
if len(syncable_repos) > 0: if len(syncable_repos) > 0:

View File

@@ -15,8 +15,8 @@ endif
endif endif
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES := healthd_board_cm.cpp LOCAL_SRC_FILES := healthd_board_lineage.cpp
LOCAL_MODULE := libhealthd.cm LOCAL_MODULE := libhealthd.lineage
LOCAL_CFLAGS := -Werror LOCAL_CFLAGS := -Werror
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
system/core/healthd/include \ system/core/healthd/include \
@@ -44,7 +44,7 @@ include $(CLEAR_VARS)
define _add-charger-image define _add-charger-image
include $$(CLEAR_VARS) include $$(CLEAR_VARS)
LOCAL_MODULE := vendor_cm_charger_$(notdir $(1)) LOCAL_MODULE := vendor_lineage_charger_$(notdir $(1))
LOCAL_MODULE_STEM := $(notdir $(1)) LOCAL_MODULE_STEM := $(notdir $(1))
_img_modules += $$(LOCAL_MODULE) _img_modules += $$(LOCAL_MODULE)
LOCAL_SRC_FILES := $1 LOCAL_SRC_FILES := $1
@@ -60,7 +60,7 @@ $(foreach _img, $(call find-subdir-subdir-files, "images/$(healthd_density)", "*
$(eval $(call _add-charger-image,$(_img)))) $(eval $(call _add-charger-image,$(_img))))
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := cm_charger_res_images LOCAL_MODULE := lineage_charger_res_images
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_REQUIRED_MODULES := $(_img_modules) LOCAL_REQUIRED_MODULES := $(_img_modules)
LOCAL_OVERRIDES_PACKAGES := charger_res_images LOCAL_OVERRIDES_PACKAGES := charger_res_images

View File

@@ -303,10 +303,10 @@ void healthd_board_init(struct healthd_config*)
char value[PROP_VALUE_MAX]; char value[PROP_VALUE_MAX];
int rc = 0, scale_count = 0, i; int rc = 0, scale_count = 0, i;
GRSurface **scale_frames; GRSurface **scale_frames;
int scale_fps; // Not in use (charger/cm_battery_scale doesn't have FPS text int scale_fps; // Not in use (charger/lineage_battery_scale doesn't have FPS text
// chunk). We are using hard-coded frame.disp_time instead. // chunk). We are using hard-coded frame.disp_time instead.
rc = res_create_multi_display_surface("charger/cm_battery_scale", rc = res_create_multi_display_surface("charger/lineage_battery_scale",
&scale_count, &scale_fps, &scale_frames); &scale_count, &scale_fps, &scale_frames);
if (rc < 0) { if (rc < 0) {
LOGE("%s: Unable to load battery scale image", __func__); LOGE("%s: Unable to load battery scale image", __func__);

View File

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View File

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

View File

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

View File

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

View File

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 42 KiB

View File

@@ -1,6 +1,6 @@
# Charger # Charger
ifneq ($(WITH_CM_CHARGER),false) ifneq ($(WITH_LINEAGE_CHARGER),false)
BOARD_HAL_STATIC_LIBRARIES := libhealthd.cm BOARD_HAL_STATIC_LIBRARIES := libhealthd.lineage
endif endif
ifeq ($(BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE),) ifeq ($(BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE),)

View File

@@ -31,15 +31,11 @@ ifneq ($(TARGET_BUILD_VARIANT),eng)
ADDITIONAL_DEFAULT_PROPERTIES += ro.adb.secure=1 ADDITIONAL_DEFAULT_PROPERTIES += ro.adb.secure=1
endif endif
# Copy over the changelog to the device
PRODUCT_COPY_FILES += \
vendor/lineage/CHANGELOG.mkdn:system/etc/CHANGELOG-CM.txt
# Backup Tool # Backup Tool
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
vendor/lineage/prebuilt/common/bin/backuptool.sh:install/bin/backuptool.sh \ vendor/lineage/prebuilt/common/bin/backuptool.sh:install/bin/backuptool.sh \
vendor/lineage/prebuilt/common/bin/backuptool.functions:install/bin/backuptool.functions \ vendor/lineage/prebuilt/common/bin/backuptool.functions:install/bin/backuptool.functions \
vendor/lineage/prebuilt/common/bin/50-cm.sh:system/addon.d/50-cm.sh \ vendor/lineage/prebuilt/common/bin/50-lineage.sh:system/addon.d/50-lineage.sh \
vendor/lineage/prebuilt/common/bin/blacklist:system/addon.d/blacklist vendor/lineage/prebuilt/common/bin/blacklist:system/addon.d/blacklist
# Backup Services whitelist # Backup Services whitelist
@@ -61,9 +57,9 @@ PRODUCT_COPY_FILES += \
vendor/lineage/prebuilt/common/etc/init.d/90userinit:system/etc/init.d/90userinit vendor/lineage/prebuilt/common/etc/init.d/90userinit:system/etc/init.d/90userinit
endif endif
# CM-specific init file # Lineage-specific init file
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
vendor/lineage/prebuilt/common/etc/init.local.rc:root/init.cm.rc vendor/lineage/prebuilt/common/etc/init.local.rc:root/init.lineage.rc
# Copy over added mimetype supported in libcore.net.MimeUtils # Copy over added mimetype supported in libcore.net.MimeUtils
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
@@ -77,12 +73,12 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
frameworks/base/data/keyboards/Vendor_045e_Product_028e.kl:system/usr/keylayout/Vendor_045e_Product_0719.kl frameworks/base/data/keyboards/Vendor_045e_Product_028e.kl:system/usr/keylayout/Vendor_045e_Product_0719.kl
# This is CM! # This is Lineage!
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
vendor/lineage/config/permissions/com.cyanogenmod.android.xml:system/etc/permissions/com.cyanogenmod.android.xml vendor/lineage/config/permissions/com.cyanogenmod.android.xml:system/etc/permissions/com.cyanogenmod.android.xml
# Include CM audio files # Include Lineage audio files
include vendor/lineage/config/cm_audio.mk include vendor/lineage/config/lineage_audio.mk
# Theme engine # Theme engine
include vendor/lineage/config/themes_common.mk include vendor/lineage/config/themes_common.mk
@@ -101,7 +97,7 @@ endif
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
bootanimation.zip bootanimation.zip
# Required CM packages # Required Lineage packages
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
BluetoothExt \ BluetoothExt \
CMAudioService \ CMAudioService \
@@ -110,7 +106,7 @@ PRODUCT_PACKAGES += \
Profiles \ Profiles \
WeatherManagerService WeatherManagerService
# Optional CM packages # Optional packages
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
libemoji \ libemoji \
LiveWallpapersPicker \ LiveWallpapersPicker \
@@ -122,7 +118,7 @@ PRODUCT_PACKAGES += \
libprotobuf-cpp-full \ libprotobuf-cpp-full \
librsjni librsjni
# Custom CM packages # Custom Lineage packages
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
AudioFX \ AudioFX \
CMSettingsProvider \ CMSettingsProvider \
@@ -141,7 +137,7 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
Exchange2 Exchange2
# Extra tools in CM # Extra tools in Lineage
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
7z \ 7z \
bash \ bash \
@@ -169,12 +165,12 @@ PRODUCT_PACKAGES += \
zip zip
# Custom off-mode charger # Custom off-mode charger
ifneq ($(WITH_CM_CHARGER),false) ifneq ($(WITH_LINEAGE_CHARGER),false)
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
charger_res_images \ charger_res_images \
cm_charger_res_images \ lineage_charger_res_images \
font_log.png \ font_log.png \
libhealthd.cm libhealthd.lineage
endif endif
# ExFAT support # ExFAT support
@@ -237,124 +233,124 @@ endif
DEVICE_PACKAGE_OVERLAYS += vendor/lineage/overlay/common DEVICE_PACKAGE_OVERLAYS += vendor/lineage/overlay/common
PRODUCT_VERSION_MAJOR = 14 PRODUCT_VERSION_MAJOR = 15
PRODUCT_VERSION_MINOR = 1 PRODUCT_VERSION_MINOR = 0
PRODUCT_VERSION_MAINTENANCE := 0 PRODUCT_VERSION_MAINTENANCE := 0
ifeq ($(TARGET_VENDOR_SHOW_MAINTENANCE_VERSION),true) ifeq ($(TARGET_VENDOR_SHOW_MAINTENANCE_VERSION),true)
CM_VERSION_MAINTENANCE := $(PRODUCT_VERSION_MAINTENANCE) LINEAGE_VERSION_MAINTENANCE := $(PRODUCT_VERSION_MAINTENANCE)
else else
CM_VERSION_MAINTENANCE := 0 LINEAGE_VERSION_MAINTENANCE := 0
endif endif
# Set CM_BUILDTYPE from the env RELEASE_TYPE, for jenkins compat # Set LINEAGE_BUILDTYPE from the env RELEASE_TYPE, for jenkins compat
ifndef CM_BUILDTYPE ifndef LINEAGE_BUILDTYPE
ifdef RELEASE_TYPE ifdef RELEASE_TYPE
# Starting with "CM_" is optional # Starting with "LINEAGE_" is optional
RELEASE_TYPE := $(shell echo $(RELEASE_TYPE) | sed -e 's|^CM_||g') RELEASE_TYPE := $(shell echo $(RELEASE_TYPE) | sed -e 's|^LINEAGE_||g')
CM_BUILDTYPE := $(RELEASE_TYPE) LINEAGE_BUILDTYPE := $(RELEASE_TYPE)
endif endif
endif endif
# Filter out random types, so it'll reset to UNOFFICIAL # Filter out random types, so it'll reset to UNOFFICIAL
ifeq ($(filter RELEASE NIGHTLY SNAPSHOT EXPERIMENTAL,$(CM_BUILDTYPE)),) ifeq ($(filter RELEASE NIGHTLY SNAPSHOT EXPERIMENTAL,$(LINEAGE_BUILDTYPE)),)
CM_BUILDTYPE := LINEAGE_BUILDTYPE :=
endif endif
ifdef CM_BUILDTYPE ifdef LINEAGE_BUILDTYPE
ifneq ($(CM_BUILDTYPE), SNAPSHOT) ifneq ($(LINEAGE_BUILDTYPE), SNAPSHOT)
ifdef CM_EXTRAVERSION ifdef LINEAGE_EXTRAVERSION
# Force build type to EXPERIMENTAL # Force build type to EXPERIMENTAL
CM_BUILDTYPE := EXPERIMENTAL LINEAGE_BUILDTYPE := EXPERIMENTAL
# Remove leading dash from CM_EXTRAVERSION # Remove leading dash from LINEAGE_EXTRAVERSION
CM_EXTRAVERSION := $(shell echo $(CM_EXTRAVERSION) | sed 's/-//') LINEAGE_EXTRAVERSION := $(shell echo $(LINEAGE_EXTRAVERSION) | sed 's/-//')
# Add leading dash to CM_EXTRAVERSION # Add leading dash to LINEAGE_EXTRAVERSION
CM_EXTRAVERSION := -$(CM_EXTRAVERSION) LINEAGE_EXTRAVERSION := -$(LINEAGE_EXTRAVERSION)
endif endif
else else
ifndef CM_EXTRAVERSION ifndef LINEAGE_EXTRAVERSION
# Force build type to EXPERIMENTAL, SNAPSHOT mandates a tag # Force build type to EXPERIMENTAL, SNAPSHOT mandates a tag
CM_BUILDTYPE := EXPERIMENTAL LINEAGE_BUILDTYPE := EXPERIMENTAL
else else
# Remove leading dash from CM_EXTRAVERSION # Remove leading dash from LINEAGE_EXTRAVERSION
CM_EXTRAVERSION := $(shell echo $(CM_EXTRAVERSION) | sed 's/-//') LINEAGE_EXTRAVERSION := $(shell echo $(LINEAGE_EXTRAVERSION) | sed 's/-//')
# Add leading dash to CM_EXTRAVERSION # Add leading dash to LINEAGE_EXTRAVERSION
CM_EXTRAVERSION := -$(CM_EXTRAVERSION) LINEAGE_EXTRAVERSION := -$(LINEAGE_EXTRAVERSION)
endif endif
endif endif
else else
# If CM_BUILDTYPE is not defined, set to UNOFFICIAL # If LINEAGE_BUILDTYPE is not defined, set to UNOFFICIAL
CM_BUILDTYPE := UNOFFICIAL LINEAGE_BUILDTYPE := UNOFFICIAL
CM_EXTRAVERSION := LINEAGE_EXTRAVERSION :=
endif endif
ifeq ($(CM_BUILDTYPE), UNOFFICIAL) ifeq ($(LINEAGE_BUILDTYPE), UNOFFICIAL)
ifneq ($(TARGET_UNOFFICIAL_BUILD_ID),) ifneq ($(TARGET_UNOFFICIAL_BUILD_ID),)
CM_EXTRAVERSION := -$(TARGET_UNOFFICIAL_BUILD_ID) LINEAGE_EXTRAVERSION := -$(TARGET_UNOFFICIAL_BUILD_ID)
endif endif
endif endif
ifeq ($(CM_BUILDTYPE), RELEASE) ifeq ($(LINEAGE_BUILDTYPE), RELEASE)
ifndef TARGET_VENDOR_RELEASE_BUILD_ID ifndef TARGET_VENDOR_RELEASE_BUILD_ID
LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(CM_BUILD) LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(LINEAGE_BUILD)
else else
ifeq ($(TARGET_BUILD_VARIANT),user) ifeq ($(TARGET_BUILD_VARIANT),user)
ifeq ($(CM_VERSION_MAINTENANCE),0) ifeq ($(LINEAGE_VERSION_MAINTENANCE),0)
LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(CM_BUILD) LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(LINEAGE_BUILD)
else else
LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(CM_VERSION_MAINTENANCE)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(CM_BUILD) LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(LINEAGE_VERSION_MAINTENANCE)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(LINEAGE_BUILD)
endif endif
else else
LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(CM_BUILD) LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(LINEAGE_BUILD)
endif endif
endif endif
else else
ifeq ($(CM_VERSION_MAINTENANCE),0) ifeq ($(LINEAGE_VERSION_MAINTENANCE),0)
LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(shell date -u +%Y%m%d)-$(CM_BUILDTYPE)$(CM_EXTRAVERSION)-$(CM_BUILD) LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(shell date -u +%Y%m%d)-$(LINEAGE_BUILDTYPE)$(LINEAGE_EXTRAVERSION)-$(LINEAGE_BUILD)
else else
LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(CM_VERSION_MAINTENANCE)-$(shell date -u +%Y%m%d)-$(CM_BUILDTYPE)$(CM_EXTRAVERSION)-$(CM_BUILD) LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(LINEAGE_VERSION_MAINTENANCE)-$(shell date -u +%Y%m%d)-$(LINEAGE_BUILDTYPE)$(LINEAGE_EXTRAVERSION)-$(LINEAGE_BUILD)
endif endif
endif endif
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
ro.cm.version=$(LINEAGE_VERSION) \ ro.lineage.version=$(LINEAGE_VERSION) \
ro.cm.releasetype=$(CM_BUILDTYPE) \ ro.lineage.releasetype=$(LINEAGE_BUILDTYPE) \
ro.modversion=$(LINEAGE_VERSION) \ ro.modversion=$(LINEAGE_VERSION) \
ro.cmlegal.url=https://lineageos.org/legal ro.lineagelegal.url=https://lineageos.org/legal
PRODUCT_EXTRA_RECOVERY_KEYS += \ PRODUCT_EXTRA_RECOVERY_KEYS += \
vendor/lineage/build/target/product/security/lineage vendor/lineage/build/target/product/security/lineage
-include vendor/cm-priv/keys/keys.mk -include vendor/lineage-priv/keys/keys.mk
CM_DISPLAY_VERSION := $(LINEAGE_VERSION) LINEAGE_DISPLAY_VERSION := $(LINEAGE_VERSION)
ifneq ($(PRODUCT_DEFAULT_DEV_CERTIFICATE),) ifneq ($(PRODUCT_DEFAULT_DEV_CERTIFICATE),)
ifneq ($(PRODUCT_DEFAULT_DEV_CERTIFICATE),build/target/product/security/testkey) ifneq ($(PRODUCT_DEFAULT_DEV_CERTIFICATE),build/target/product/security/testkey)
ifneq ($(CM_BUILDTYPE), UNOFFICIAL) ifneq ($(LINEAGE_BUILDTYPE), UNOFFICIAL)
ifndef TARGET_VENDOR_RELEASE_BUILD_ID ifndef TARGET_VENDOR_RELEASE_BUILD_ID
ifneq ($(CM_EXTRAVERSION),) ifneq ($(LINEAGE_EXTRAVERSION),)
# Remove leading dash from CM_EXTRAVERSION # Remove leading dash from LINEAGE_EXTRAVERSION
CM_EXTRAVERSION := $(shell echo $(CM_EXTRAVERSION) | sed 's/-//') LINEAGE_EXTRAVERSION := $(shell echo $(LINEAGE_EXTRAVERSION) | sed 's/-//')
TARGET_VENDOR_RELEASE_BUILD_ID := $(CM_EXTRAVERSION) TARGET_VENDOR_RELEASE_BUILD_ID := $(LINEAGE_EXTRAVERSION)
else else
TARGET_VENDOR_RELEASE_BUILD_ID := $(shell date -u +%Y%m%d) TARGET_VENDOR_RELEASE_BUILD_ID := $(shell date -u +%Y%m%d)
endif endif
else else
TARGET_VENDOR_RELEASE_BUILD_ID := $(TARGET_VENDOR_RELEASE_BUILD_ID) TARGET_VENDOR_RELEASE_BUILD_ID := $(TARGET_VENDOR_RELEASE_BUILD_ID)
endif endif
ifeq ($(CM_VERSION_MAINTENANCE),0) ifeq ($(LINEAGE_VERSION_MAINTENANCE),0)
CM_DISPLAY_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(CM_BUILD) LINEAGE_DISPLAY_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(LINEAGE_BUILD)
else else
CM_DISPLAY_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(CM_VERSION_MAINTENANCE)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(CM_BUILD) LINEAGE_DISPLAY_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(LINEAGE_VERSION_MAINTENANCE)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(LINEAGE_BUILD)
endif endif
endif endif
endif endif
endif endif
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
ro.cm.display.version=$(CM_DISPLAY_VERSION) ro.lineage.display.version=$(LINEAGE_DISPLAY_VERSION)
-include $(WORKSPACE)/build_env/image-auto-bits.mk -include $(WORKSPACE)/build_env/image-auto-bits.mk
-include vendor/lineage/config/partner_gms.mk -include vendor/lineage/config/partner_gms.mk

View File

@@ -1,4 +1,4 @@
# Inherit common CM stuff # Inherit common Lineage stuff
$(call inherit-product, vendor/lineage/config/common.mk) $(call inherit-product, vendor/lineage/config/common.mk)
PRODUCT_SIZE := full PRODUCT_SIZE := full

View File

@@ -1,11 +1,11 @@
# Inherit common CM stuff # Inherit full common Lineage stuff
$(call inherit-product, vendor/lineage/config/common_full.mk) $(call inherit-product, vendor/lineage/config/common_full.mk)
# Required CM packages # Required packages
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
LatinIME LatinIME
# Include CM LatinIME dictionaries # Include Lineage LatinIME dictionaries
PRODUCT_PACKAGE_OVERLAYS += vendor/lineage/overlay/dictionaries PRODUCT_PACKAGE_OVERLAYS += vendor/lineage/overlay/dictionaries
$(call inherit-product, vendor/lineage/config/telephony.mk) $(call inherit-product, vendor/lineage/config/telephony.mk)

View File

@@ -1,9 +1,9 @@
# Inherit common CM stuff # Inherit full common Lineage stuff
$(call inherit-product, vendor/lineage/config/common_full.mk) $(call inherit-product, vendor/lineage/config/common_full.mk)
# Required CM packages # Required packages
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
LatinIME LatinIME
# Include CM LatinIME dictionaries # Include Lineage LatinIME dictionaries
PRODUCT_PACKAGE_OVERLAYS += vendor/lineage/overlay/dictionaries PRODUCT_PACKAGE_OVERLAYS += vendor/lineage/overlay/dictionaries

View File

@@ -1,4 +1,4 @@
# Inherit common CM stuff # Inherit full common Lineage stuff
$(call inherit-product, vendor/lineage/config/common_full.mk) $(call inherit-product, vendor/lineage/config/common_full.mk)
PRODUCT_PACKAGES += TvSettings PRODUCT_PACKAGES += TvSettings

View File

@@ -1,4 +1,4 @@
# Inherit common CM stuff # Inherit mini common Lineage stuff
$(call inherit-product, vendor/lineage/config/common.mk) $(call inherit-product, vendor/lineage/config/common.mk)
PRODUCT_SIZE := mini PRODUCT_SIZE := mini

View File

@@ -1,6 +1,7 @@
# Inherit mini common Lineage stuff
$(call inherit-product, vendor/lineage/config/common_mini.mk) $(call inherit-product, vendor/lineage/config/common_mini.mk)
# Required CM packages # Required packages
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
LatinIME LatinIME

View File

@@ -1,6 +1,6 @@
# Inherit common CM stuff # Inherit mini common Lineage stuff
$(call inherit-product, vendor/lineage/config/common_mini.mk) $(call inherit-product, vendor/lineage/config/common_mini.mk)
# Required CM packages # Required packages
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
LatinIME LatinIME

View File

@@ -1,2 +1,2 @@
# Inherit common CM stuff # Inherit mini common Lineage stuff
$(call inherit-product, vendor/lineage/config/common_mini.mk) $(call inherit-product, vendor/lineage/config/common_mini.mk)

View File

@@ -1,11 +1,10 @@
# #
# CyanogenMod Audio Files # Lineage Audio Files
# #
ALARM_PATH := vendor/lineage/prebuilt/common/media/audio/alarms ALARM_PATH := vendor/lineage/prebuilt/common/media/audio/alarms
NOTIFICATION_PATH := vendor/lineage/prebuilt/common/media/audio/notifications NOTIFICATION_PATH := vendor/lineage/prebuilt/common/media/audio/notifications
RINGTONE_PATH := vendor/lineage/prebuilt/common/media/audio/ringtones RINGTONE_PATH := vendor/lineage/prebuilt/common/media/audio/ringtones
UI_PATH := vendor/lineage/prebuilt/common/media/audio/ui
# Alarms # Alarms
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
@@ -26,11 +25,11 @@ PRODUCT_COPY_FILES += \
# Ringtones # Ringtones
ifeq ($(TARGET_NEEDS_BOOSTED_SOUNDS),true) ifeq ($(TARGET_NEEDS_BOOSTED_SOUNDS),true)
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
$(RINGTONE_PATH)/boosted/Boxbeat.ogg:system/media/audio/ringtones/Boxbeat.ogg \ $(RINGTONE_PATH)/boosted/Boxbeat.ogg:system/media/audio/ringtones/Boxbeat.ogg \
$(RINGTONE_PATH)/boosted/CyanTone.ogg:system/media/audio/ringtones/CyanTone.ogg \ $(RINGTONE_PATH)/boosted/CyanTone.ogg:system/media/audio/ringtones/CyanTone.ogg \
$(RINGTONE_PATH)/boosted/Highscore.ogg:system/media/audio/ringtones/Highscore.ogg \ $(RINGTONE_PATH)/boosted/Highscore.ogg:system/media/audio/ringtones/Highscore.ogg \
$(RINGTONE_PATH)/boosted/Lyon.ogg:system/media/audio/ringtones/Lyon.ogg \ $(RINGTONE_PATH)/boosted/Lyon.ogg:system/media/audio/ringtones/Lyon.ogg \
$(RINGTONE_PATH)/boosted/Rockin.ogg:system/media/audio/ringtones/Rockin.ogg $(RINGTONE_PATH)/boosted/Rockin.ogg:system/media/audio/ringtones/Rockin.ogg
else else
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
$(RINGTONE_PATH)/Boxbeat.ogg:system/media/audio/ringtones/Boxbeat.ogg \ $(RINGTONE_PATH)/Boxbeat.ogg:system/media/audio/ringtones/Boxbeat.ogg \

View File

@@ -1,7 +1,7 @@
#!/sbin/sh #!/sbin/sh
# #
# /system/addon.d/50-cm.sh # /system/addon.d/50-lineage.sh
# During a LineageOS 14.1 upgrade, this script backs up /system/etc/hosts, # During a LineageOS 15.0 upgrade, this script backs up /system/etc/hosts,
# /system is formatted and reinstalled, then the file is restored. # /system is formatted and reinstalled, then the file is restored.
# #

View File

@@ -5,7 +5,7 @@
export C=/tmp/backupdir export C=/tmp/backupdir
export S=/system export S=/system
export V=14.1 export V=15.0
copy_file() { copy_file() {
cp -dp "$1" "$2" cp -dp "$1" "$2"

View File

@@ -5,7 +5,7 @@
export C=/tmp/backupdir export C=/tmp/backupdir
export S=/system export S=/system
export V=14.1 export V=15.0
# Scripts in /system/addon.d expect to find backuptool.functions in /tmp # Scripts in /system/addon.d expect to find backuptool.functions in /tmp
cp -f /tmp/install/bin/backuptool.functions /tmp cp -f /tmp/install/bin/backuptool.functions /tmp
@@ -34,7 +34,7 @@ check_prereq() {
if [ ! -r /system/build.prop ]; then if [ ! -r /system/build.prop ]; then
return 0 return 0
fi fi
if ( ! grep -q "^ro.cm.version=$V.*" /system/build.prop ); then if ( ! grep -q "^ro.lineage.version=$V.*" /system/build.prop ); then
echo "Not backing up files from incompatible version: $V" echo "Not backing up files from incompatible version: $V"
return 0 return 0
fi fi

View File

@@ -2,7 +2,7 @@
# #
# Print startup info # Print startup info
# #
L="log -p i -t cm" L="log -p i -t lineage"
$L "_ _ " $L "_ _ "
$L "| (_)_ __ ___ __ _ __ _ ___ ___ ___ " $L "| (_)_ __ ___ __ _ __ _ ___ ___ ___ "
@@ -10,4 +10,4 @@ $L "| | | '_ \\ / _ \\/ _\` |/ _\` |/ _ \\/ _ \\/ __|"
$L "| | | | | | __/ (_| | (_| | __/ (_) \\__ \\" $L "| | | | | | __/ (_| | (_| | __/ (_) \\__ \\"
$L "|_|_|_| |_|\\___|\\__,_|\\__, |\\___|\\___/|___/" $L "|_|_|_| |_|\\___|\\__,_|\\__, |\\___|\\___/|___/"
$L " |___/" $L " |___/"
$L "Welcome to Android `getprop ro.build.version.release` / LineageOS-`getprop ro.cm.version`"; $L "Welcome to Android `getprop ro.build.version.release` / LineageOS-`getprop ro.lineage.version`";

View File

@@ -5,5 +5,5 @@ if [ -e /data/local/userinit.sh ];
then then
log -p i -t userinit "Executing /data/local/userinit.sh"; log -p i -t userinit "Executing /data/local/userinit.sh";
/system/bin/sh /data/local/userinit.sh; /system/bin/sh /data/local/userinit.sh;
setprop cm.userinit.active 1; setprop lineage.userinit.active 1;
fi; fi;

View File

@@ -1,4 +1,4 @@
for combo in $(curl -s https://raw.githubusercontent.com/LineageOS/hudson/master/lineage-build-targets | sed -e 's/#.*$//' | grep cm-14.1 | awk '{printf "lineage_%s-%s\n", $1, $2}') for combo in $(curl -s https://raw.githubusercontent.com/LineageOS/hudson/master/lineage-build-targets | sed -e 's/#.*$//' | grep lineage-15.0 | awk '{printf "lineage_%s-%s\n", $1, $2}')
do do
add_lunch_combo $combo add_lunch_combo $combo
done done