B2G icon indicating copy to clipboard operation
B2G copied to clipboard
verified publisher icon andreasgal

make sync failing on untracked Android.mk

Open benfrancis opened this issue 13 years ago • 5 comments

Earlier today fabrice reported a problem with make sync returning these errors http://pastebin.mozilla.org/1486325

He says it's working again for him now, but when I run make sync I get:

git pull origin master From https://github.com/andreasgal/B2G

  • branch master -> FETCH_HEAD Updating 976666d..be14c34 error: Untracked working tree file 'glue/gonk/dalvik/libnativehelper/Android.mk' would be overwritten by merge. Aborting make: *** [sync] Error 1

benfrancis avatar Feb 17 '12 18:02 benfrancis

I just got that, too. I deleted the files and then make sync worked. But I dunno if those files will be re-created after my next build. I'll find out in a few minutes, I guess.

jlebar avatar Feb 17 '12 18:02 jlebar

Yeah, deleting them worked fine. The pull re-created those files.

jlebar avatar Feb 17 '12 19:02 jlebar

Yeah a rm -rf glue/gonk/dalvik is recommended here. I'm not sure there's any way to make git behave better.

michaelwu avatar Feb 17 '12 21:02 michaelwu

I got this too. Will try rm -rf glue/gonk/dalvik

timdream avatar Feb 19 '12 17:02 timdream

|make mrproper| or |git clean -dfx && git reset --hard|.

ThinkerYzu avatar Feb 19 '12 17:02 ThinkerYzu