Closed Bug 835992 Opened 7 years ago Closed 7 years ago

Makefile variables in mobile/android/base/android-services-files.mk are hard to parse

Categories

(Android Background Services Graveyard :: Build & Test, defect, P5)

All
Android
defect

Tracking

(Not tracked)

RESOLVED FIXED
mozilla21

People

(Reporter: nalexander, Assigned: nalexander)

References

()

Details

Attachments

(1 file)

At the moment, we write

VAR := 1.java 2.java

Which, when you have 500+ files, makes it hard to see any differences.  We should write

VAR := \
  1.java \
  2.java \
  $(NULL)

which makes it easy to see what files were added or removed, and fits the Fennec Makefile.in style.
Patch resulting from changes to Android Sync scripts.
Attachment #707793 - Flags: review?(rnewman)
Assignee: nobody → nalexander
Priority: -- → P5
Comment on attachment 707793 [details] [diff] [review]
Patch against m-i

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

::: mobile/android/base/android-services-files.mk
@@ +277,5 @@
> +  mobile/android/base/resources/drawable/pin_background.xml \
> +  $(NULL)
> +
> +SYNC_RES_DRAWABLE_LDPI := \
> +  $(NULL)

This doesn't seem right. Either you're not outputting stuff, or the var can get killed…
Attachment #707793 - Flags: review?(rnewman) → review+
(In reply to Richard Newman [:rnewman] from comment #3)
> Comment on attachment 707793 [details] [diff] [review]
> Patch against m-i
> 
> Review of attachment 707793 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> ::: mobile/android/base/android-services-files.mk
> @@ +277,5 @@
> > +  mobile/android/base/resources/drawable/pin_background.xml \
> > +  $(NULL)
> > +
> > +SYNC_RES_DRAWABLE_LDPI := \
> > +  $(NULL)
> 
> This doesn't seem right. Either you're not outputting stuff, or the var can
> get killed…

It is right:

-SYNC_RES_DRAWABLE_LDPI := 
-SYNC_RES_DRAWABLE_MDPI := mobile/android/base/resources/drawable-mdpi/desktop.png mobile/android/base/resources/drawable-mdpi/mobile.png
-SYNC_RES_DRAWABLE_HDPI := 

The variable can be killed, but I'd rather keep it for when we actually will use it.
Try run for 9c60ed5b4161 is complete.
Detailed breakdown of the results available here:
    https://tbpl.mozilla.org/?tree=Try&rev=9c60ed5b4161
Results (out of 37 total builds):
    success: 31
    warnings: 6
Builds (or logs if builds failed) available at:
http://ftp.mozilla.org/pub/mozilla.org/firefox/try-builds/nalexander@mozilla.com-9c60ed5b4161
https://hg.mozilla.org/mozilla-central/rev/f13ebcc74a0d
Status: ASSIGNED → RESOLVED
Closed: 7 years ago
Resolution: --- → FIXED
Component: Android Sync: Build & Test → Build & Test
Product: Mozilla Services → Android Background Services
You need to log in before you can comment on or make changes to this bug.