CODEWITHSUNDEEP
version-controlandroid-source
vrtx54234
vrtx54234

Reputation: 2316

Maintaining changes to android source

If I have to change the source code of an app(Email, Browser, etc) for some custom requirement, I wonder how I should maintain the changes so that I can upgrade to the newer version of the app later when it's available.

I can thinking of maintaining the diff patch and applying to the newer version later but I am wondering if there are any best practices. Is it good to just fork off a branch and keep merging the newer changes into it?

Thanks.

Upvotes: 1

Views: 89

Answers (2)

Yury
Yury

Reputation: 20936

Sony several times described their process. Here is the links:

  1. http://developer.sonymobile.com/2013/07/25/explaining-the-software-upgrade-process-and-its-improvements-for-android-4-3/
  2. http://developer.sonymobile.com/2011/12/07/ice-cream-sandwich-from-source-code-release-to-software-upgrade/

Upvotes: 1

Robin
Robin

Reputation: 10368

You should follow the disciplines that:

  1. Keep your modifications aside from the original code as much as possible - this will save your effort if you have to do merge code later
  2. Record your modification work in an appropriate way, you need to know why you made these changes and how you did it.
  3. Don't expert to do a simple merge since the changes might not be fast-forward. Rebase your repository first and pick your changes and apply carefully.

Upvotes: 1

Related Questions