1196970 - Reduce references to $OBJDIR in Android Gradle configuration

Status: RESOLVED FIXED

(Firefox Build System :: Android Studio and Gradle Integration, defect)

Description

[Nick Alexander :nalexander [he/him]]

sebastian reviewed a number of small improvements to the Android Gradle configuration over in Bug 1176133.  These do not really depend on or block the work in Bug 1176133, so I'm splitting them out.

These improvements reduce the number of references to $OBJDIR in the Android Gradle configuration, a generally positive thing.

Comment 1

[Nick Alexander :nalexander [he/him]]

url:        https://hg.mozilla.org/integration/fx-team/rev/94ffbd584e2d0770cd865eac7f4e430a378071fc
changeset:  94ffbd584e2d0770cd865eac7f4e430a378071fc
user:       Nick Alexander <[e-mail]>
date:       Thu Aug 20 15:10:34 2015 -0700
description:
Bug 1196970 - Part 1: Fix some dependency paths. r=me

url:        https://hg.mozilla.org/integration/fx-team/rev/0d4d40845d1dc98f09834f9fb1345e31114c96a9
changeset:  0d4d40845d1dc98f09834f9fb1345e31114c96a9
user:       Nick Alexander <[e-mail]>
date:       Thu Aug 20 15:10:06 2015 -0700
description:
Bug 1196970 - Part 2: Make all Android Gradle projects generateCodeAndResoures. r=me

It's convenient to know that the object directory is up-to-date (after
|make gradle-targets|) before any Gradle project builds.

url:        https://hg.mozilla.org/integration/fx-team/rev/298be7a6c9adcb17e1203c66525e857e1eef54a8
changeset:  298be7a6c9adcb17e1203c66525e857e1eef54a8
user:       Nick Alexander <[e-mail]>
date:       Fri Aug 07 14:05:50 2015 -0700
description:
Bug 1196970 - Part 3: Keep all preprocessed_code references in the objdir. r=sebastian

This was just an oversight.  The Gradle configuration referenced
topsrcdir rather than having a symlink via the objdir.  This didn't
impact the Gradle build, but it did make the preprocessed_code Gradle
project appear outside of the root Gradle project in IntelliJ.

url:        https://hg.mozilla.org/integration/fx-team/rev/0f883cca5b4006e897606f053d532a75019c10ba
changeset:  0f883cca5b4006e897606f053d532a75019c10ba
user:       Nick Alexander <[e-mail]>
date:       Tue Aug 18 10:51:10 2015 -0700
description:
Bug 1196970 - Part 4: Copy omni.ja, native libraries, and asset libraries from dist/fennec manually. r=sebastian

This allows us to not require dist/fennec/* to exist in the object
directory at gradle-install time.  It gets us one small step closer to
being able to sit down to a fresh source tree and open a Fennec
project in IntelliJ.

url:        https://hg.mozilla.org/integration/fx-team/rev/0351b18996b97ecc3599510987056da547ceeee5
changeset:  0351b18996b97ecc3599510987056da547ceeee5
user:       Nick Alexander <[e-mail]>
date:       Fri Aug 07 16:38:43 2015 -0700
description:
Bug 1196970 - Part 5: Copy preprocessed code from objdir to build directory during Gradle build. r=sebastian

This means we don't require the directory in the object directory at
gradle-install time.  We're not concerned if the source files are
missing, since we have code to ensure they're fresh already; and if
they are missing, we'll quickly fail as we try to compile with missing
sources.

url:        https://hg.mozilla.org/integration/fx-team/rev/c92b5eb419b09ca81fcde189486435a6ce7f41f4
changeset:  c92b5eb419b09ca81fcde189486435a6ce7f41f4
user:       Nick Alexander <[e-mail]>
date:       Fri Aug 07 17:00:51 2015 -0700
description:
Bug 1196970 - Part 6: Copy preprocessed resources from objdir to build directory during Gradle build. r=sebastian
DONTBUILD NPOTB

This means we don't require the directory in the object directory at
gradle-install time.  We're not concerned if the resource files are
missing, since we have code to ensure they're fresh already; and if
they are missing, we'll quickly fail as we try to process the resource
set.

Comment 2

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/94ffbd584e2d
https://hg.mozilla.org/mozilla-central/rev/0d4d40845d1d
https://hg.mozilla.org/mozilla-central/rev/298be7a6c9ad
https://hg.mozilla.org/mozilla-central/rev/0f883cca5b40
https://hg.mozilla.org/mozilla-central/rev/0351b18996b9
https://hg.mozilla.org/mozilla-central/rev/c92b5eb419b0