1288644 - Don't define RTLD_NOLOAD when __ANDROID_API__ >= 21

Status: RESOLVED FIXED

(Core :: Security: PSM, defect, P1)

Description

[Makoto Kato [:m_kato]]

When using --with-android-version=21 such as Android 64-bit, RTLD_NOLOAD is defined in NDK.  So it will be conflict with our definition.

Comment 1

[Makoto Kato [:m_kato]]

Attachment: Bug 1288644 - Don't define RTLD_NOLOAD when __ANDROID_API__ >= 21.

Review commit: https://reviewboard.mozilla.org/r/66396/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/66396/

Comment 2

[Mike Hommey [:glandium]]

Comment on attachment 8773641 [details]
Bug 1288644 - Don't define RTLD_NOLOAD when __ANDROID_API__ >= 21.

https://reviewboard.mozilla.org/r/66396/#review63908

::: security/manager/android_stub.h:22
(Diff revision 1)
>  #include <linux/kernel.h>
>  #include <unistd.h>
>  
> +#ifndef ANDROID_VERSION
> +#include <android/api-level.h>
> +#define ANDROID_VERISON __ANDROID_API__

You have a typo here.

Comment 3

[Makoto Kato [:m_kato]]

Comment on attachment 8773641 [details]
Bug 1288644 - Don't define RTLD_NOLOAD when __ANDROID_API__ >= 21.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/66396/diff/1-2/

Comment 4

[Mike Hommey [:glandium]]

Comment on attachment 8773641 [details]
Bug 1288644 - Don't define RTLD_NOLOAD when __ANDROID_API__ >= 21.

https://reviewboard.mozilla.org/r/66396/#review64776

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/135382fd463d
Don't define RTLD_NOLOAD when __ANDROID_API__ >= 21. r=glandium

Comment 6

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/135382fd463d