712380 - Add support for clobbering the Android resources when needed

Status: RESOLVED FIXED

(Firefox for Android Graveyard :: General, defect, P3)

Description

[Mark Finkle (:mfinkle) (use needinfo?)]

Right now, when we change or rename an Android drawable in the resources folder, a clobber is sometimes required.

Can we get the makefiles to clear out the resources?

Comment 1

[Sriram Ramasubramanian [:sriram]]

Here are few places where clobbering is needed regarding drawables:

1. If we are changing a drawable file, (like a different shape for tabs-button -- with same file name), -- build will succeed, but old image will be used.
2. If we are changing a drawable file completely to a different extension (like repeating a tabs.png in a tabs.xml -- where tabs.png was existing so long) -- build will fail saying "resource already exists"
3. If we are changing a drawable file with a better quality resource (like providing a drawable-hdpi/ or a drawable-xhdpi/ version of a file in drawable/ folder) -- build will succeed, but drawable/ file will be getting used.

Comment 2

[Brad Lassey [:blassey] (use needinfo?)]

Attachment: patch

this fixed (for me) the issue that mfinkle and I were discussing when he filed this bug

Comment 3

[Brad Lassey [:blassey] (use needinfo?)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/ac9fac23227a

Comment 4

[Ed Morley [:emorley]]

Backed out for intermittent native build failures:
https://tbpl.mozilla.org/?tree=Mozilla-Inbound&rev=ac9fac23227a
https://tbpl.mozilla.org/php/getParsedLog.php?id=8082349&tree=Mozilla-Inbound
{
/builds/slave/m-in-andrd/build/obj-firefox/config/nsinstall -D res/layout
/builds/slave/m-in-andrd/build/obj-firefox/config/nsinstall: cannot change mode of /builds/slave/m-in-andrd/build/obj-firefox/mobile/android/base/res/layout/autocomplete_list_item.xml: No such file or directory
/builds/slave/m-in-andrd/build/obj-firefox/config/nsinstall: cannot change mode of /builds/slave/m-in-andrd/build/obj-firefox/mobile/android/base/res/layout/autocomplete_list_item.xml: No such file or directory
make[6]: *** [res/layout/autocomplete_list_item.xml] Error 1
}

https://hg.mozilla.org/integration/mozilla-inbound/rev/c78f7c5e1736

Comment 5

[Brad Lassey [:blassey] (use needinfo?)]

Attachment: patch v.2

also pushed to try https://tbpl.mozilla.org/?tree=Try&rev=80afd447c97d

Comment 6

[Mozilla RelEng Bot]

Try run for 80afd447c97d is complete.
Detailed breakdown of the results available here:
    https://tbpl.mozilla.org/?tree=Try&rev=80afd447c97d
Results (out of 3 total builds):
    success: 3
Builds (or logs if builds failed) available at:
http://ftp.mozilla.org/pub/mozilla.org/firefox/try-builds/[e-mail]-80afd447c97d

Comment 7

[Doug Turner (:dougt)]

Comment on attachment 583682 [details] [diff] [review]
patch v.2

Review of attachment 583682 [details] [diff] [review]:
-----------------------------------------------------------------

rs=me

make sure things continue to build

Comment 8

[Brad Lassey [:blassey] (use needinfo?)]

(In reply to Doug Turner (:dougt) from comment #7)
> Comment on attachment 583682 [details] [diff] [review]
> patch v.2
> 
> Review of attachment 583682 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> rs=me
> 
> make sure things continue to build

see comment 6 for the all green try run

Comment 9

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/56ceeff7cfb8

Comment 10

[Mark Finkle (:mfinkle) (use needinfo?)]

Brad - Do we need this on Aurora? I am thinking we could skip it unless there is an infra/build reason we might want it.

Comment 11

[Brad Lassey [:blassey] (use needinfo?)]

No, not needed on Aurora, though we may want it to avoid merge conflicts

Comment 12

[Mark Finkle (:mfinkle) (use needinfo?)]

Comment on attachment 583682 [details] [diff] [review]
patch v.2

[Approval Request Comment]
this patch has created a merge problem for landing more patches onto aurora. I'm afraid we need to take this patch just to get the Makefile.in changes.

Comment 13

[Alex Keybl [:akeybl]]

Comment on attachment 583682 [details] [diff] [review]
patch v.2

[Triage Comment]
Mobile only - approved for aurora.

Comment 14

[Brad Lassey [:blassey] (use needinfo?)]

Attachment: patch for aurora

need to split out the sync-related changes since it hasn't landed on aurora yet

Comment 15

[Brad Lassey [:blassey] (use needinfo?)]

Attachment: patch for aurora

[Approval Request Comment]
This is just build clean up. The full patch has been on m-c for a while and several later patches depend on it.

The risk of not taking it is having to rebase several other patches.

When sync lands the rest of this should land with it.

Comment 16

[Doug Turner (:dougt)]

Comment on attachment 591375 [details] [diff] [review]
patch for aurora

Review of attachment 591375 [details] [diff] [review]:
-----------------------------------------------------------------

keep it building!

Comment 17

[Richard Newman [:rnewman]]

I will be landing this with my Aurora uplift today, assuming I got the merge right.

Comment 18

[Richard Newman [:rnewman]]

https://hg.mozilla.org/releases/mozilla-aurora/rev/699a36336685