Bug 1398051 - Remove android_stub.h. r?Build
android_stub.h is already unnecessary, so let's remove this.
MozReview-Commit-ID: C8oXznXu632
deleted file mode 100644
--- a/security/manager/android_stub.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* This file allows NSS to build by stubbing out
- * features that aren't provided by Android/Bionic */
-
-#ifndef ANDROID_STUB_H
-#define ANDROID_STUB_H
-
-/* sysinfo is defined but not implemented.
- * we may be able to implement it ourselves. */
-#define _SYS_SYSINFO_H_
-
-#include <sys/cdefs.h>
-#include <sys/resource.h>
-#include <linux/kernel.h>
-#include <unistd.h>
-
-#ifndef ANDROID_VERSION
-#include <android/api-level.h>
-#define ANDROID_VERSION __ANDROID_API__
-#endif
-
-#if ANDROID_VERSION < 21
-#define RTLD_NOLOAD 0
-#endif
-
-#define sysinfo(foo) -1
-
-#endif /* ANDROID_STUB_H */
--- a/security/moz.build
+++ b/security/moz.build
@@ -116,17 +116,16 @@ else:
if CONFIG['OS_TARGET'] == 'WINNT':
if CONFIG['CPU_ARCH'] == 'x86':
# This should really be the default.
sandbox_vars['ASFLAGS'] = ['-safeseh']
if CONFIG['MOZ_FOLD_LIBS_FLAGS']:
sandbox_vars['CFLAGS'] = CONFIG['MOZ_FOLD_LIBS_FLAGS']
if CONFIG['OS_TARGET'] == 'Android':
sandbox_vars['CFLAGS'] = [
- '-include', TOPSRCDIR + '/security/manager/android_stub.h',
# Setting sandbox_vars['DEFINES'] is broken currently.
'-DCHECK_FORK_GETPID',
]
if CONFIG['ANDROID_VERSION']:
sandbox_vars['CFLAGS'] += ['-DANDROID_VERSION=' + CONFIG['ANDROID_VERSION']]
GYP_DIRS['nss'].sandbox_vars = sandbox_vars
GYP_DIRS['nss'].no_chromium = True
GYP_DIRS['nss'].no_unified = True