Closed Bug 1032756 Opened 8 years ago Closed 8 years ago

Look for zipalign in Android's build tools directory

Categories

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

All
Android
defect
Not set
normal

Tracking

(firefox31 fixed, firefox32 fixed, firefox33 fixed)

RESOLVED FIXED
mozilla33
Tracking Status
firefox31 --- fixed
firefox32 --- fixed
firefox33 --- fixed

People

(Reporter: lucasr, Assigned: nalexander)

Details

Attachments

(1 file, 1 obsolete file)

I get a build error otherwise.
Comment on attachment 8448632 [details] [diff] [review]
Look for zipalign in Android's built tools directory (r=nalexander)

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

Fixes the build for me.
Attachment #8448632 - Flags: review?(nalexander)
Will this break for older SDKs since you no longer look in ANDROID_TOOLS?
(In reply to Mark Finkle (:mfinkle) from comment #3)
> Will this break for older SDKs since you no longer look in ANDROID_TOOLS?

No idea, to be honest. Will check.
Google has a history of moving the Android tools around.  We don't care
where they are, so let's try to find them anywhere we can.

glandium: I tested by moving zipalign around between the various
directories, killing config.cache, re-running |mach configure|, and
inspecting config.status.  All good.

lucasr: can you verify this works for you?
Attachment #8448632 - Attachment is obsolete: true
Attachment #8448632 - Flags: review?(nalexander)
Attachment #8449694 - Flags: review?(mh+mozilla)
Attachment #8449694 - Flags: feedback?(lucasr.at.mozilla)
Comment on attachment 8449694 [details] [diff] [review]
Look for Android {build-,platform-}tools in all possible locations. r=glandium

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

Works for me.
Attachment #8449694 - Flags: feedback?(lucasr.at.mozilla) → feedback+
Comment on attachment 8449694 [details] [diff] [review]
Look for Android {build-,platform-}tools in all possible locations. r=glandium

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

::: build/autoconf/android.m4
@@ +387,5 @@
> +    MOZ_PATH_PROG(ZIPALIGN, zipalign, :, [$ALL_ANDROID_TOOLS_PATHS])
> +    MOZ_PATH_PROG(DX, dx, :, [$ALL_ANDROID_TOOLS_PATHS])
> +    MOZ_PATH_PROG(AAPT, aapt, :, [$ALL_ANDROID_TOOLS_PATHS])
> +    MOZ_PATH_PROG(AIDL, aidl, :, [$ALL_ANDROID_TOOLS_PATHS])
> +    MOZ_PATH_PROG(ADB, adb, :, [$ALL_ANDROID_TOOLS_PATHS])

Seems extreme, but meh.
Attachment #8449694 - Flags: review?(mh+mozilla) → review+
https://hg.mozilla.org/integration/fx-team/rev/bafba8a17aa9
Assignee: lucasr.at.mozilla → nalexander
Status: NEW → ASSIGNED
https://hg.mozilla.org/mozilla-central/rev/bafba8a17aa9
Status: ASSIGNED → RESOLVED
Closed: 8 years ago
Resolution: --- → FIXED
Target Milestone: --- → Firefox 33
Any chance of this change getting pushed to aurora/beta?
Comment on attachment 8449694 [details] [diff] [review]
Look for Android {build-,platform-}tools in all possible locations. r=glandium

Approval Request Comment
[Feature/regressing bug #]: Google.  It's always Google.

[User impact if declined]: none.

[Describe test coverage new/current, TBPL]: been on m-c for a while.

[Risks and why]: essentially none.  Build time configuration only; shouldn't change a thing in automation.

[String/UUID change made/needed]: none.
Attachment #8449694 - Flags: approval-mozilla-beta?
Attachment #8449694 - Flags: approval-mozilla-aurora?
Comment on attachment 8449694 [details] [diff] [review]
Look for Android {build-,platform-}tools in all possible locations. r=glandium

No risk to the final user. If that can simplify the life of the dev, taking it.
Attachment #8449694 - Flags: approval-mozilla-beta?
Attachment #8449694 - Flags: approval-mozilla-beta+
Attachment #8449694 - Flags: approval-mozilla-aurora?
Attachment #8449694 - Flags: approval-mozilla-aurora+
Product: Firefox for Android → Firefox Build System
Target Milestone: Firefox 33 → mozilla33
You need to log in before you can comment on or make changes to this bug.