Closed Bug 712380 Opened 8 years ago Closed 8 years ago

Add support for clobbering the Android resources when needed

Categories

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

x86
Linux
defect

Tracking

()

RESOLVED FIXED
Firefox 12
Tracking Status
firefox11 --- fixed
fennec 11+ ---

People

(Reporter: mfinkle, Assigned: blassey)

Details

(Whiteboard: [fennec-aurora])

Attachments

(2 files, 2 obsolete files)

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?
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.
Attached patch patch (obsolete) — Splinter Review
this fixed (for me) the issue that mfinkle and I were discussing when he filed this bug
Assignee: nobody → blassey.bugs
Attachment #583288 - Flags: review?(mark.finkle)
Attachment #583288 - Flags: review?(mark.finkle) → review+
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
Whiteboard: [fennec-aurora][inbound] → [fennec-aurora]
Attached patch patch v.2Splinter Review
also pushed to try https://tbpl.mozilla.org/?tree=Try&rev=80afd447c97d
Attachment #583288 - Attachment is obsolete: true
Attachment #583682 - Flags: review?(khuey)
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/blassey@mozilla.com-80afd447c97d
Priority: -- → P3
Attachment #583682 - Flags: review?(khuey) → review?(doug.turner)
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
Attachment #583682 - Flags: review?(doug.turner) → review+
(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
https://hg.mozilla.org/mozilla-central/rev/56ceeff7cfb8
Status: NEW → RESOLVED
Closed: 8 years ago
Resolution: --- → FIXED
Target Milestone: --- → Firefox 12
tracking-fennec: --- → 11+
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.
No, not needed on Aurora, though we may want it to avoid merge conflicts
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.
Attachment #583682 - Flags: approval-mozilla-aurora?
Comment on attachment 583682 [details] [diff] [review]
patch v.2

[Triage Comment]
Mobile only - approved for aurora.
Attachment #583682 - Flags: approval-mozilla-aurora? → approval-mozilla-aurora+
Attached patch patch for aurora (obsolete) — Splinter Review
need to split out the sync-related changes since it hasn't landed on aurora yet
Attached patch patch for auroraSplinter Review
[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.
Attachment #590396 - Attachment is obsolete: true
Attachment #591375 - Flags: review?(doug.turner)
Attachment #591375 - Flags: approval-mozilla-aurora?
Comment on attachment 591375 [details] [diff] [review]
patch for aurora

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

keep it building!
Attachment #591375 - Flags: review?(doug.turner)
Attachment #591375 - Flags: review+
Attachment #591375 - Flags: approval-mozilla-aurora?
Attachment #591375 - Flags: approval-mozilla-aurora+
I will be landing this with my Aurora uplift today, assuming I got the merge right.
You need to log in before you can comment on or make changes to this bug.