Issue #1053 - Second pass remove android defines and build system stuff.

Mostly IPC, tools and mozbuild.

5 files changed, 0 insertions, 40 deletions

diff --git a/tools/lint/eslint/modules.json b/tools/lint/eslint/modules.json
index d170f81be9..0b4401636f 100644
--- a/tools/lint/eslint/modules.json
+++ b/tools/lint/eslint/modules.json
@@ -102,7 +102,6 @@
   "import_module.jsm": ["MODULE_IMPORTED", "MODULE_URI", "SUBMODULE_IMPORTED", "same_scope", "SUBMODULE_IMPORTED_TO_SCOPE"],
   "import_sub_module.jsm": ["SUBMODULE_IMPORTED", "test_obj"],
   "InlineSpellChecker.jsm": ["InlineSpellChecker", "SpellCheckHelper"],
-  "JNI.jsm": ["JNI", "android_log"],
   "jpakeclient.js": ["JPAKEClient", "SendCredentialsController"],
   "Jsbeautify.jsm": ["jsBeautify"],
   "jsdebugger.jsm": ["addDebuggerToGlobal"],
@@ -133,7 +132,6 @@
   "mozelement.js": ["Elem", "Selector", "ID", "Link", "XPath", "Name", "Lookup", "MozMillElement", "MozMillCheckBox", "MozMillRadio", "MozMillDropList", "MozMillTextBox", "subclasses"],
   "mozmill.js": ["controller", "utils", "elementslib", "os", "getBrowserController", "newBrowserController", "getAddonsController", "getPreferencesController", "newMail3PaneController", "getMail3PaneController", "wm", "platform", "getAddrbkController", "getMsgComposeController", "getDownloadsController", "Application", "findElement", "getPlacesController", "isMac", "isLinux", "isWindows", "firePythonCallback", "getAddons"],
   "msgbroker.js": ["addListener", "addObject", "removeListener", "sendMessage", "log", "pass", "fail"],
-  "MulticastDNSAndroid.jsm": ["MulticastDNS"],
   "NativeMessaging.jsm": ["HostManifestManager", "NativeApp"],
   "NetworkPrioritizer.jsm": ["trackBrowserWindow"],
   "NotificationDB.jsm": [],
diff --git a/tools/profiler/core/PlatformMacros.h b/tools/profiler/core/PlatformMacros.h
index 0bedbd512f..de74531e8e 100644
--- a/tools/profiler/core/PlatformMacros.h
+++ b/tools/profiler/core/PlatformMacros.h
@@ -12,7 +12,6 @@
    and OS_ macros are defined too, since they are sometimes
    convenient. */
 
-#undef SPS_PLAT_arm_android
 #undef SPS_PLAT_amd64_linux
 #undef SPS_PLAT_x86_linux
 #undef SPS_PLAT_amd64_darwin
@@ -24,7 +23,6 @@
 #undef SPS_ARCH_x86
 #undef SPS_ARCH_amd64
 
-#undef SPS_OS_android
 #undef SPS_OS_linux
 #undef SPS_OS_darwin
 #undef SPS_OS_windows
diff --git a/tools/profiler/lul/LulElfInt.h b/tools/profiler/lul/LulElfInt.h
index 72075dc297..98efc655c3 100644
--- a/tools/profiler/lul/LulElfInt.h
+++ b/tools/profiler/lul/LulElfInt.h
@@ -31,7 +31,6 @@
 
 // This file is derived from the following files in
 // toolkit/crashreporter/google-breakpad:
-//   src/common/android/include/elf.h
 //   src/common/linux/elfutils.h
 //   src/common/linux/file_id.h
 //   src/common/linux/elfutils-inl.h
@@ -54,38 +53,7 @@
 // elfutils.h: Utilities for dealing with ELF files.
 //
 
-#if defined(LUL_OS_android)
-
-// From toolkit/crashreporter/google-breakpad/src/common/android/include/elf.h
-// The Android headers don't always define this constant.
-#ifndef EM_X86_64
-#define EM_X86_64  62
-#endif
-
-#ifndef EM_PPC64
-#define EM_PPC64   21
-#endif
-
-#ifndef EM_S390
-#define EM_S390    22
-#endif
-
-#ifndef NT_GNU_BUILD_ID
-#define NT_GNU_BUILD_ID 3
-#endif
-
-#define ElfW(type)      _ElfW (Elf, ELFSIZE, type)
-#define _ElfW(e,w,t)    _ElfW_1 (e, w, _##t)
-#define _ElfW_1(e,w,t)  e##w##t
-
-//FIXME
-extern "C" {
-  extern char*  basename(const char*  path);
-};
-#else
-
 # include <link.h>
-#endif
 
 
 namespace lul {
diff --git a/tools/profiler/lul/LulPlatformMacros.h b/tools/profiler/lul/LulPlatformMacros.h
index 6464da0678..7004e594b2 100644
--- a/tools/profiler/lul/LulPlatformMacros.h
+++ b/tools/profiler/lul/LulPlatformMacros.h
@@ -15,14 +15,11 @@
 
 #undef LUL_PLAT_x64_linux
 #undef LUL_PLAT_x86_linux
-#undef LUL_PLAT_arm_android
-#undef LUL_PLAT_x86_android
 
 #undef LUL_ARCH_arm
 #undef LUL_ARCH_x86
 #undef LUL_ARCH_x64
 
-#undef LUL_OS_android
 #undef LUL_OS_linux
 
 #if defined(__linux__) && defined(__x86_64__)
diff --git a/tools/rewriting/ThirdPartyPaths.txt b/tools/rewriting/ThirdPartyPaths.txt
index e784566dea..ab6c4b9cc6 100644
--- a/tools/rewriting/ThirdPartyPaths.txt
+++ b/tools/rewriting/ThirdPartyPaths.txt
@@ -45,7 +45,6 @@ media/webrtc/trunk/
 mfbt/decimal/
 mfbt/double-conversion/
 mfbt/lz4
-mobile/android/thirdparty/
 modules/brotli/
 modules/freetype2/
 modules/libbz2/