Nick Alexander
28663ebee3
Bug 979388 - Make aapt invocation rebuild R.java. r=glandium
...
This commit adds an empty recipe to dependencies of .aapt.deps, which
forces the appropriate gecko-R.jar rebuild. This is because Make treats
targets with no recipe at all differently than targets with an empty
recipe, in a way that defeats our dependencies.
What appeared to be happening is the following:
Touch a resource. On the next build, .aapt.deps is stale, so aapt is
invoked, which generates R.java, and we touch .aapt.deps.
Now R.java depends on .aapt.deps, but this does not appear to force Make
to consider targets that depend on R.java to be stale. A target that
depends on R.java (such as gecko-R.jar) itself compares timestamps and
finds that gecko-R.jar is newer than R.java (from the previous build),
and this comparison appears to happen before aapt is invoked. So even
though .aapt.deps is seen to be stale, and by transitivity R.java is
stale, this does not mark gecko-R.jar as stale. The timestamp check
between R.java and gecko-R.jar appears to happen *before* aapt is
invoked.
On the second build following the update, the R.java generated in the
previous build is newer than gecko-R.jar, triggering the observed
rebuild of gecko-R.jar.
2014-03-12 17:22:27 -07:00
Nick Alexander
3720d512ba
Bug 978587 - Pre: Let Java JARs contain either sources or generated sources. r=blassey
2014-03-05 08:57:09 -08:00
Nick Alexander
1fd81b5538
Bug 903528 - Follow-up: Fix build dependencies. a=bustage
...
The issue is that the preprocessed files need to be referenced as
$(CURDIR)/file to have Make handle the dependencies correctly. To
allow this, this patch adds ANDROID_MANIFEST_FILE (defaulting to
AndroidManifest.xml) and uses it in the appropriate places.
2014-02-24 23:18:47 -08:00
Nick Alexander
0d131e80d7
Bug 903528 - Pre: Make classes.dex depend on ANDROID_EXTRA_JARS. r=glandium
2014-02-24 18:24:45 -08:00
Nick Alexander
ec132ddcf5
Bug 946083 - Part 1: Delete .class files when (re-)building a Java JAR. r=glandium
...
This cleans up stale .class files, so they don't get packaged into the
.jar files that Proguard consumes.
--HG--
extra : rebase_source : a090d707579711f85b8f9f174b88bf9302be0b24
2014-02-11 09:55:47 -08:00
Ryan VanderMeulen
f46afed6ea
Backed out changesets 6948901b128f and d9a099b06911 (bug 946083) and changeset 1e038f308b8d (bug 961339) for intermittent Android build failures.
2014-02-11 09:35:12 -05:00
Nick Alexander
d848739427
Bug 946083 - Part 1: Delete .class files when (re-)building a Java JAR. r=glandium
...
This cleans up stale .class files, so they don't get packaged into the
.jar files that Proguard consumes.
2014-02-10 21:43:00 -08:00
Nick Alexander
01e16e28ef
Bug 961339 - Fix generated/ source dependencies. r=glandium
...
Generated sources are listed like 'generated/FILE.java'. Generated
sources are produced by PP_TARGETS, which generates the file
'$(CURDIR)/generated/FILE.java'. Because Make interprets $(CURDIR)/foo
and foo differently, this means we need to depend on $(CURDIR)/* for all
generated sources. Since R.java is both listed as a generated source,
but produced by aapt, we need any dependencies to be on
$(CURDIR)/.../R.java.
The change to java-build.mk includes $(CURDIR) in the dependencies for
generated sources. The changes to Makefile.in includes $(CURDIR) in the
produced R.java files for Make.
2014-02-10 21:43:00 -08:00
Nick Alexander
6fade1ad27
Bug 934646 - Part 3: Declare Android resource directories relative to $SRCDIR. r=glandium,gps,mfinkle
...
--HG--
rename : mobile/android/base/resources/drawable-mdpi/crash_reporter.png => mobile/android/base/crashreporter/res/drawable-mdpi/crash_reporter.png
rename : mobile/android/base/resources/layout/crash_reporter.xml => mobile/android/base/crashreporter/res/layout/crash_reporter.xml
rename : mobile/android/branding/aurora/content/fennec_72x72.png => mobile/android/branding/aurora/res/drawable-hdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_48x48.png => mobile/android/branding/aurora/res/drawable-mdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_96x96.png => mobile/android/branding/aurora/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_144x144.png => mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_72x72.png => mobile/android/branding/beta/res/drawable-hdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_48x48.png => mobile/android/branding/beta/res/drawable-mdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_96x96.png => mobile/android/branding/beta/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_144x144.png => mobile/android/branding/beta/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_72x72.png => mobile/android/branding/nightly/res/drawable-hdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_48x48.png => mobile/android/branding/nightly/res/drawable-mdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_96x96.png => mobile/android/branding/nightly/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_144x144.png => mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_72x72.png => mobile/android/branding/official/res/drawable-hdpi/icon.png
rename : mobile/android/branding/official/content/fennec_48x48.png => mobile/android/branding/official/res/drawable-mdpi/icon.png
rename : mobile/android/branding/official/content/fennec_96x96.png => mobile/android/branding/official/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_144x144.png => mobile/android/branding/official/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_72x72.png => mobile/android/branding/unofficial/res/drawable-hdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_48x48.png => mobile/android/branding/unofficial/res/drawable-mdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_96x96.png => mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_144x144.png => mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png
extra : rebase_source : f6ec8a38594e70520b10202c735dc019f8c856fd
2013-12-11 21:20:07 -08:00
Carsten "Tomcat" Book
22519643b6
Backed out changeset a829f4d2584a (bug 934646) Android Nightlies Build Bustage
...
--HG--
rename : mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png => mobile/android/branding/aurora/content/fennec_144x144.png
rename : mobile/android/branding/aurora/res/drawable-mdpi/icon.png => mobile/android/branding/aurora/content/fennec_48x48.png
rename : mobile/android/branding/aurora/res/drawable-hdpi/icon.png => mobile/android/branding/aurora/content/fennec_72x72.png
rename : mobile/android/branding/aurora/res/drawable-xhdpi/icon.png => mobile/android/branding/aurora/content/fennec_96x96.png
rename : mobile/android/branding/beta/res/drawable-xxhdpi/icon.png => mobile/android/branding/beta/content/fennec_144x144.png
rename : mobile/android/branding/beta/res/drawable-mdpi/icon.png => mobile/android/branding/beta/content/fennec_48x48.png
rename : mobile/android/branding/beta/res/drawable-hdpi/icon.png => mobile/android/branding/beta/content/fennec_72x72.png
rename : mobile/android/branding/beta/res/drawable-xhdpi/icon.png => mobile/android/branding/beta/content/fennec_96x96.png
rename : mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png => mobile/android/branding/nightly/content/fennec_144x144.png
rename : mobile/android/branding/nightly/res/drawable-mdpi/icon.png => mobile/android/branding/nightly/content/fennec_48x48.png
rename : mobile/android/branding/nightly/res/drawable-hdpi/icon.png => mobile/android/branding/nightly/content/fennec_72x72.png
rename : mobile/android/branding/nightly/res/drawable-xhdpi/icon.png => mobile/android/branding/nightly/content/fennec_96x96.png
rename : mobile/android/branding/official/res/drawable-xxhdpi/icon.png => mobile/android/branding/official/content/fennec_144x144.png
rename : mobile/android/branding/official/res/drawable-mdpi/icon.png => mobile/android/branding/official/content/fennec_48x48.png
rename : mobile/android/branding/official/res/drawable-hdpi/icon.png => mobile/android/branding/official/content/fennec_72x72.png
rename : mobile/android/branding/official/res/drawable-xhdpi/icon.png => mobile/android/branding/official/content/fennec_96x96.png
rename : mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png => mobile/android/branding/unofficial/content/fennec_144x144.png
rename : mobile/android/branding/unofficial/res/drawable-mdpi/icon.png => mobile/android/branding/unofficial/content/fennec_48x48.png
rename : mobile/android/branding/unofficial/res/drawable-hdpi/icon.png => mobile/android/branding/unofficial/content/fennec_72x72.png
rename : mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png => mobile/android/branding/unofficial/content/fennec_96x96.png
2013-11-20 15:16:00 +01:00
Nick Alexander
0bec83eec7
Bug 934646 - Declare Android resource directories relative to $SRCDIR. r=glandium,gps,mfinkle
...
--HG--
rename : mobile/android/branding/aurora/content/fennec_72x72.png => mobile/android/branding/aurora/res/drawable-hdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_48x48.png => mobile/android/branding/aurora/res/drawable-mdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_96x96.png => mobile/android/branding/aurora/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_144x144.png => mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_72x72.png => mobile/android/branding/beta/res/drawable-hdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_48x48.png => mobile/android/branding/beta/res/drawable-mdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_96x96.png => mobile/android/branding/beta/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_144x144.png => mobile/android/branding/beta/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_72x72.png => mobile/android/branding/nightly/res/drawable-hdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_48x48.png => mobile/android/branding/nightly/res/drawable-mdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_96x96.png => mobile/android/branding/nightly/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_144x144.png => mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_72x72.png => mobile/android/branding/official/res/drawable-hdpi/icon.png
rename : mobile/android/branding/official/content/fennec_48x48.png => mobile/android/branding/official/res/drawable-mdpi/icon.png
rename : mobile/android/branding/official/content/fennec_96x96.png => mobile/android/branding/official/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_144x144.png => mobile/android/branding/official/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_72x72.png => mobile/android/branding/unofficial/res/drawable-hdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_48x48.png => mobile/android/branding/unofficial/res/drawable-mdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_96x96.png => mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_144x144.png => mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png
2013-11-18 09:31:55 -08:00
Nick Alexander
fdfe926d99
Bug 900522 - Part 2: Use ANDROID_RESFILES in mobile/android/base/moz.build. r=gps
...
This defines ANDROID_RESFILES in mobile/android/base/moz.build but
does not use the default processing from java-build.mk.
* * *
Bug 900522 - Part 1: Make ANDROID_RESFILES a moz.build-only variable. r=gps
2013-10-09 16:19:00 -07:00
Nick Alexander
5b2ccde7b1
Bug 923306 - Follow-up: Address review comment. r=me
2013-10-09 17:14:20 -07:00
Nick Alexander
7e9466764b
Bug 923306 - Add JAVA_JAR_TARGETS. r=glandium
2013-10-09 17:05:36 -07:00
Nick Alexander
d7d5b7e7df
Bug 919563 - Standardize APK generation. r=glandium
...
This only handles the simple cases: no mobile/android/base (yet).
2013-10-01 12:43:30 -07:00
Nick Alexander
e509ad8b1c
Bug 909432 - Unify RESFILES and RES_FILES, and rename both to ANDROID_RESFILES. r=gps
2013-09-23 09:02:08 -07:00
Joey Armstrong
a6c49bb883
bug 751156: robocop dependency build should be a nop
2013-03-19 15:34:59 -04:00
Joey Armstrong
ee2eada8c4
bug 747540: fix dependencies for java build
2013-01-25 15:22:13 -05:00
