Sounds like you've modified frameworks/base/Android.mk

repo status and repo diff will confirm that.

If you don't want those changes, cd to frameworks/base and run 'git
reset --hard' (warning - this'll delete all your uncommited local
changes in all of frameworks/base).

JBQ

On Mon, Apr 27, 2009 at 9:33 PM, Gani Bhagavathula
<[email protected]> wrote:
>
> This morning, I did a repo sync.  I got an error with that which says
> -
>
> ------------------------------------------------------------------------------------------------------------------------------------
> Fetching projects: 100% (114/114), done.
> error: You have local changes to 'Android.mk'; cannot switch branches.
> Syncing work tree: 100% (113/113), done.
>
> error: frameworks/base/: platform/frameworks/base checkout refs/
> remotes/korg/cupcake.
>
> -------------------------------------------------------------------------------------------------------------------------------------
>
> and then when I try to compile, I get an error which is related...
>
>  No rule to make target `vendor/google/frameworks/maps/
> com.google.android.maps.xml'
>
> I guess I have something f'ed up in terms of I checked out cupcake
> branch, and now I am trying to get something from the main branch or
> something.
>
> Do I have any other choice apart from redo the original setup and sync
> again?
>
> Regards,
> Gani
> >
>



-- 
Jean-Baptiste M. "JBQ" Queru
Android Engineer, Google.

Questions sent directly to me that have no reason for being private
will likely get ignored or forwarded to a public forum with no further
warning.

--~--~---------~--~----~------------~-------~--~----~
unsubscribe: [email protected]
website: http://groups.google.com/group/android-porting
-~----------~----~----~----~------~----~------~--~---

Reply via email to