[Android] memory_inspector: move backends one folder up.

This simply moves the backends in backends/android up one folder.
The current naming structure was redundant and some of the classes
there are not really android specific. Moving up since there is some
work in progress to introduce support for other platforms, so it
doesn't make much sense to keep a folder named 'android'.
No functional change is intended.

BUG=340294
NOTRY=true
R=skyostil@chromium.org

Review URL: https://codereview.chromium.org/574663002

Cr-Commit-Position: refs/heads/master@{#295040}

6 files changed, 5 insertions, 5 deletions

diff --git a/tools/memory_inspector/memory_inspector/__init__.py b/tools/memory_inspector/memory_inspector/__init__.py
index 26e0a34..9af0071 100644
--- a/tools/memory_inspector/memory_inspector/__init__.py
+++ b/tools/memory_inspector/memory_inspector/__init__.py
@@ -11,8 +11,8 @@ ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir))
 
 def RegisterAllBackends():
   """Registers all the known backends."""
+  from memory_inspector.backends import android_backend
   from memory_inspector.core import backends
-  from memory_inspector.backends.android import android_backend
   backends.Register(android_backend.AndroidBackend())
 
 
diff --git a/tools/memory_inspector/memory_inspector/backends/android/__init__.py b/tools/memory_inspector/memory_inspector/backends/android/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/tools/memory_inspector/memory_inspector/backends/android/__init__.py
+++ /dev/null
diff --git a/tools/memory_inspector/memory_inspector/backends/android/android_backend.py b/tools/memory_inspector/memory_inspector/backends/android_backend.py
index c7cfe81..1fa855b 100644
--- a/tools/memory_inspector/memory_inspector/backends/android/android_backend.py
+++ b/tools/memory_inspector/memory_inspector/backends/android_backend.py
@@ -15,9 +15,9 @@ import os
 import posixpath
 
 from memory_inspector import constants
+from memory_inspector.backends import memdump_parser
+from memory_inspector.backends import native_heap_dump_parser
 from memory_inspector.backends import prebuilts_fetcher
-from memory_inspector.backends.android import native_heap_dump_parser
-from memory_inspector.backends.android import memdump_parser
 from memory_inspector.core import backends
 from memory_inspector.core import exceptions
 from memory_inspector.core import native_heap
diff --git a/tools/memory_inspector/memory_inspector/backends/android/android_backend_unittest.py b/tools/memory_inspector/memory_inspector/backends/android_backend_unittest.py
index 29cfae3..69a7dba 100644
--- a/tools/memory_inspector/memory_inspector/backends/android/android_backend_unittest.py
+++ b/tools/memory_inspector/memory_inspector/backends/android_backend_unittest.py
@@ -2,13 +2,13 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-"""Unittests for the backends.android modules."""
+"""Unittests for the android backends modules."""
 
 import os
 import unittest
 
+from memory_inspector.backends import android_backend
 from memory_inspector.backends import prebuilts_fetcher
-from memory_inspector.backends.android import android_backend
 from memory_inspector.unittest.mock_adb import mock_adb
 
 
diff --git a/tools/memory_inspector/memory_inspector/backends/android/memdump_parser.py b/tools/memory_inspector/memory_inspector/backends/memdump_parser.py
index a60ea25..a60ea25 100644
--- a/tools/memory_inspector/memory_inspector/backends/android/memdump_parser.py
+++ b/tools/memory_inspector/memory_inspector/backends/memdump_parser.py
diff --git a/tools/memory_inspector/memory_inspector/backends/android/native_heap_dump_parser.py b/tools/memory_inspector/memory_inspector/backends/native_heap_dump_parser.py
index eb6a0d8..eb6a0d8 100644
--- a/tools/memory_inspector/memory_inspector/backends/android/native_heap_dump_parser.py
+++ b/tools/memory_inspector/memory_inspector/backends/native_heap_dump_parser.py