зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1276927: Define HAVE_ANDROID_OS before including 'android_filesystem_config.h', r=fabrice
The preprocessor token HAVE_ANDROID_OS configures 'android_filesystem_config.h' to include the correct header files from the environment. MozReview-Commit-ID: oKwdjzDjij
This commit is contained in:
Родитель
652b70fbd0
Коммит
565a7b74dc
|
@ -128,6 +128,8 @@ if CONFIG['MOZ_B2G_RIL']:
|
|||
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
|
||||
DEFINES['HAVE_ANDROID_OS'] = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'/dom/base',
|
||||
'/dom/bluetooth/common',
|
||||
|
|
|
@ -135,6 +135,8 @@ if os_linux:
|
|||
]
|
||||
DEFINES['ANDROID'] = True
|
||||
DEFINES['_POSIX_MONOTONIC_CLOCK'] = 0
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
|
||||
DEFINES['HAVE_ANDROID_OS'] = True
|
||||
|
||||
if os_bsd or os_linux:
|
||||
if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
|
||||
|
|
|
@ -16,6 +16,10 @@ SOURCES += [
|
|||
'SandboxBrokerPolicyFactory.cpp',
|
||||
]
|
||||
|
||||
if CONFIG['OS_TARGET'] == 'Android':
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
|
||||
DEFINES['HAVE_ANDROID_OS'] = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'/security/sandbox/linux', # SandboxLogging.h
|
||||
'/security/sandbox/linux/common', # SandboxInfo.h
|
||||
|
|
|
@ -14,12 +14,16 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include "GonkPermission.h"
|
||||
#include <binder/IPCThreadState.h>
|
||||
#include <binder/ProcessState.h>
|
||||
#include <binder/IServiceManager.h>
|
||||
#include <binder/IPermissionController.h>
|
||||
|
||||
#ifndef HAVE_ANDROID_OS
|
||||
#define HAVE_ANDROID_OS 1
|
||||
#endif
|
||||
#include <private/android_filesystem_config.h>
|
||||
#include "GonkPermission.h"
|
||||
|
||||
#include "mozilla/dom/ContentParent.h"
|
||||
#include "mozilla/dom/TabParent.h"
|
||||
|
|
|
@ -97,6 +97,8 @@ if CONFIG['ANDROID_VERSION'] >= '18':
|
|||
]
|
||||
]
|
||||
|
||||
DEFINES['HAVE_ANDROID_OS'] = True
|
||||
|
||||
# Suppress some GCC warnings being treated as errors:
|
||||
# - about attributes on forward declarations for types that are already
|
||||
# defined, which complains about an important MOZ_EXPORT for android::AString
|
||||
|
|
Загрузка…
Ссылка в новой задаче