1032756 - Look for zipalign in Android's build tools directory

Status: RESOLVED FIXED

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

Description

[Lucas Rocha (:lucasr)]

I get a build error otherwise.

Comment 1

[Lucas Rocha (:lucasr)]

Attachment: Look for zipalign in Android's built tools directory (r=nalexander)

Comment 2

[Lucas Rocha (:lucasr)]

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.

Comment 3

[Mark Finkle (:mfinkle) (use needinfo?)]

Will this break for older SDKs since you no longer look in ANDROID_TOOLS?

Comment 4

[Lucas Rocha (:lucasr)]

(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.

Comment 5

[Nick Alexander :nalexander [he/him]]

Attachment: Look for Android {build-,platform-}tools in all possible locations. r=glandium

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?

Comment 6

[Lucas Rocha (:lucasr)]

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.

Comment 7

[Mike Hommey [:glandium]]

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.

Comment 8

[Nick Alexander :nalexander [he/him]]

https://hg.mozilla.org/integration/fx-team/rev/bafba8a17aa9

Comment 9

[Tim Taubert [:ttaubert] (inactive)]

https://hg.mozilla.org/mozilla-central/rev/bafba8a17aa9

Comment 10

[Nathan Toone [:toonetown]]

Any chance of this change getting pushed to aurora/beta?

Comment 11

[Nick Alexander :nalexander [he/him]]

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.

Comment 12

[Sylvestre Ledru [:Sylvestre]]

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.

Comment 13

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/releases/mozilla-aurora/rev/ce4455a3ec35
https://hg.mozilla.org/releases/mozilla-beta/rev/f661d58e02fb