Joined
·
497 Posts
Anybody willing to teach git cherry pick and git so i can merge commits to my source without compile time errors?
[Want to learn] Git Cherry-pick and Git
1 - 20 of 21 Posts
Joined
·
497 Posts
After that when I execute the make command it gives many errors with the commit I recently added. Say I want to add this (https://github.com/radadev/platform_frameworks_base/commit/eee0c8587fbfeea4076d9e55532d110bc4fa4aa5) commit to my AOSP source. This gives me alot of errors while compiling or say power widgets from CM.
Joined
·
1,124 Posts
You're probably missing a lot of classes after that. Best bet is to import the whole project into eclipse and work your way from there
Joined
·
497 Posts
The full aosp source into eclipse? 
Sent from my Nexus S using Tapatalk
Sent from my Nexus S using Tapatalk
Joined
·
1,124 Posts
Yep"iceandfire said:The full aosp source into eclipse?
Sent from my Nexus S using Tapatalk
. It can handle it ok. Just takes a while to rebuild sometimes.Also be sure to follow those instructions exactly. They work just the same for CM7.
Sent from my LG-P999 using RootzWiki Forums
Joined
·
497 Posts
Okay I'll try to get the thing together and let's see. Thanks for your help.
Sent from my Nexus S using Tapatalk
Sent from my Nexus S using Tapatalk
Joined
·
497 Posts
Hey man ive set everything up but cant understand that article you sent!
"cd /path/to/android/root
make"
BTW why is eclipse needed to add widgets in notfication bar in an aosp rom?
"cd /path/to/android/root
make"
BTW why is eclipse needed to add widgets in notfication bar in an aosp rom?
Joined
·
497 Posts
Ohh okay so i need to execute make in my aosp source folder. Should I compile it for emulator or generic?
Sent from my Nexus S using Tapatalk
Sent from my Nexus S using Tapatalk
Joined
·
83 Posts
One of the things you have to remember is that just because you cherry pick one commit into something like f/b, you might need support commits into settings apk, or something like that.
Also, did the cherrypick cleanly merge in? Sometimes whitespace will cause issues, and if you had to edit the file to make the code merge you may have missed something.
In all what I am trying to say, is that cherrypick may have gone south, and it could be something left over bad not letting you compile. (for instance a missing } or ; ) So if you can pastebin the error we can figure out more.
Lastly you have to remember that some of those commits may have been since changed in the actual repo to work better with newer updates etc. It helps to look at the history of one or all of the files you are editing for the ever so important "Fix build break" commit.
Also, did the cherrypick cleanly merge in? Sometimes whitespace will cause issues, and if you had to edit the file to make the code merge you may have missed something.
In all what I am trying to say, is that cherrypick may have gone south, and it could be something left over bad not letting you compile. (for instance a missing } or ; ) So if you can pastebin the error we can figure out more.
Lastly you have to remember that some of those commits may have been since changed in the actual repo to work better with newer updates etc. It helps to look at the history of one or all of the files you are editing for the ever so important "Fix build break" commit.
Joined
·
497 Posts
I don't know anything about cherry-pick. I just took the commit code from github and used terminal to get the commit. Someone said I need to merge manually. I even don't know the basics. :/
Sent from my Nexus S using Tapatalk
Sent from my Nexus S using Tapatalk
Joined
·
497 Posts
Okay I searched for git cheat sheet and got a result from github. Lets see what i can make from it. Ill get back to you guys.
Joined
·
497 Posts
Okay im using this guide to start with git. http://www.spheredev.org/wiki/Git_for_the_lazy
Ive initialized git in my aosp folder. And added commit message as initial commit! Am I going in the right direction?
Ive initialized git in my aosp folder. And added commit message as initial commit! Am I going in the right direction?
Joined
·
1,124 Posts
The github site actually has a pretty decent beginner setup guide. You are going in the right direction though. Check this out: http://help.github.com/mac-set-up-git/
Go through all the categories and try and soak in as much info as you can
Git is the best thing to ever happen to coding. Just sayin'
Go through all the categories and try and soak in as much info as you can
Git is the best thing to ever happen to coding. Just sayin'
Joined
·
497 Posts
Hey roman that site was kind of the thing i was looking for now.. Thanks for help bro..
Joined
·
497 Posts
Joined
·
497 Posts
No one really? :O
1 - 20 of 21 Posts
