1144386 - Don't copy *.orig/rej files to geckoview_library when copying resource dir

Status: RESOLVED FIXED

(Firefox for Android Graveyard :: General, defect)

Description

[Michael Comella (:mcomella) [NI reported issues only: ex-Mozilla]]

I often get output like:

/home/mcomella/dev/noz/obj-android/mobile/android/geckoview_library/res/layout/overlay_share_dialog.xml.orig:29: error: Error: No resource found that matches the given name (at 'background' with value '@color/overlay_share_header_background').

when a merge fails. Then, even after I remove the file in m/a/b and my obj-dir, the build continues to fail (it gets re-added to the obj-dir from I don't know where). 

Potential work-around: <nalexander> mcomella: |mach gradle clean| would kill any Gradle cache

We should prevent this from happening by blacklisting the problem files (e.g. *.orig/rej), or preferably? whitelisting good files (*.xml, *.png, *.9.png).

Nick, mentorable?

Comment 1

[Nick Alexander :nalexander [he/him]]

Attachment: MozReview Request: Bug 1144386 - Avoid non-resource files when packaging resources for GeckoView. r=mcomella

Bug 1144386 - Avoid non-resource files when packaging resources for GeckoView. r=mcomella

This was just an error (on my part): I double-escaped slashes,
thinking that Make required escaping as well as the shell.

Comment 2

[Michael Comella (:mcomella) [NI reported issues only: ex-Mozilla]]

Comment on attachment 8626382 [details]
MozReview Request: Bug 1144386 - Avoid non-resource files when packaging resources for GeckoView. r=mcomella

https://reviewboard.mozilla.org/r/12079/#review10619

I don't know make well enough to know what's going on here but I'd believe it.

Comment 3

[Nick Alexander :nalexander [he/him]]

https://hg.mozilla.org/integration/fx-team/rev/9052b112f8f8

Comment 4

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/9052b112f8f8