Issue %3005 - Move hal/ to system/hardware

37 files changed, 2 insertions, 2 deletions

diff --git a/dom/ipc/moz.build b/dom/ipc/moz.build
index 5eca1a284..5913902de 100644
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -112,12 +112,12 @@ LOCAL_INCLUDES += [
     '/dom/workers',
     '/embedding/components/printingui/ipc',
     '/extensions/spellcheck/src',
-    '/hal/sandbox',
     '/layout/base',
     '/media/webrtc',
     '/netwerk/base',
     '/system/docshell/base',
     '/system/graphics/2d',
+    '/system/hardware/sandbox',
     '/system/interface',
     '/system/runtime',
     '/system/security/content',
diff --git a/hal/Hal.cpp b/system/hardware/Hal.cpp
index 88c1fa50b..88c1fa50b 100644
--- a/hal/Hal.cpp
+++ b/system/hardware/Hal.cpp
diff --git a/hal/Hal.h b/system/hardware/Hal.h
index ced295ca4..ced295ca4 100644
--- a/hal/Hal.h
+++ b/system/hardware/Hal.h
diff --git a/hal/HalImpl.h b/system/hardware/HalImpl.h
index a11010058..a11010058 100644
--- a/hal/HalImpl.h
+++ b/system/hardware/HalImpl.h
diff --git a/hal/HalInternal.h b/system/hardware/HalInternal.h
index b9c7686f7..b9c7686f7 100644
--- a/hal/HalInternal.h
+++ b/system/hardware/HalInternal.h
diff --git a/hal/HalLog.h b/system/hardware/HalLog.h
index c38df4902..c38df4902 100644
--- a/hal/HalLog.h
+++ b/system/hardware/HalLog.h
diff --git a/hal/HalSandbox.h b/system/hardware/HalSandbox.h
index 80777c36f..80777c36f 100644
--- a/hal/HalSandbox.h
+++ b/system/hardware/HalSandbox.h
diff --git a/hal/HalScreenConfiguration.h b/system/hardware/HalScreenConfiguration.h
index 57f2b6fec..57f2b6fec 100644
--- a/hal/HalScreenConfiguration.h
+++ b/system/hardware/HalScreenConfiguration.h
diff --git a/hal/HalSensor.h b/system/hardware/HalSensor.h
index c0c93be21..c0c93be21 100644
--- a/hal/HalSensor.h
+++ b/system/hardware/HalSensor.h
diff --git a/hal/HalTypes.h b/system/hardware/HalTypes.h
index dc29f0553..dc29f0553 100644
--- a/hal/HalTypes.h
+++ b/system/hardware/HalTypes.h
diff --git a/hal/HalWakeLock.cpp b/system/hardware/HalWakeLock.cpp
index e3f39a206..e3f39a206 100644
--- a/hal/HalWakeLock.cpp
+++ b/system/hardware/HalWakeLock.cpp
diff --git a/hal/HalWakeLock.h b/system/hardware/HalWakeLock.h
index 7ee6327d8..7ee6327d8 100644
--- a/hal/HalWakeLock.h
+++ b/system/hardware/HalWakeLock.h
diff --git a/hal/WindowIdentifier.cpp b/system/hardware/WindowIdentifier.cpp
index 485ad36a1..485ad36a1 100644
--- a/hal/WindowIdentifier.cpp
+++ b/system/hardware/WindowIdentifier.cpp
diff --git a/hal/WindowIdentifier.h b/system/hardware/WindowIdentifier.h
index eb410bb61..eb410bb61 100644
--- a/hal/WindowIdentifier.h
+++ b/system/hardware/WindowIdentifier.h
diff --git a/hal/fallback/FallbackAlarm.cpp b/system/hardware/fallback/FallbackAlarm.cpp
index 9ec5c48e1..9ec5c48e1 100644
--- a/hal/fallback/FallbackAlarm.cpp
+++ b/system/hardware/fallback/FallbackAlarm.cpp
diff --git a/hal/fallback/FallbackFactoryReset.cpp b/system/hardware/fallback/FallbackFactoryReset.cpp
index 76a727702..76a727702 100644
--- a/hal/fallback/FallbackFactoryReset.cpp
+++ b/system/hardware/fallback/FallbackFactoryReset.cpp
diff --git a/hal/fallback/FallbackMemory.cpp b/system/hardware/fallback/FallbackMemory.cpp
index 2750eebd8..2750eebd8 100644
--- a/hal/fallback/FallbackMemory.cpp
+++ b/system/hardware/fallback/FallbackMemory.cpp
diff --git a/hal/fallback/FallbackNetwork.cpp b/system/hardware/fallback/FallbackNetwork.cpp
index d8995bc6d..d8995bc6d 100644
--- a/hal/fallback/FallbackNetwork.cpp
+++ b/system/hardware/fallback/FallbackNetwork.cpp
diff --git a/hal/fallback/FallbackPower.cpp b/system/hardware/fallback/FallbackPower.cpp
index 11da350dd..11da350dd 100644
--- a/hal/fallback/FallbackPower.cpp
+++ b/system/hardware/fallback/FallbackPower.cpp
diff --git a/hal/fallback/FallbackProcessPriority.cpp b/system/hardware/fallback/FallbackProcessPriority.cpp
index b03b1542e..b03b1542e 100644
--- a/hal/fallback/FallbackProcessPriority.cpp
+++ b/system/hardware/fallback/FallbackProcessPriority.cpp
diff --git a/hal/fallback/FallbackScreenConfiguration.cpp b/system/hardware/fallback/FallbackScreenConfiguration.cpp
index cbee955fb..cbee955fb 100644
--- a/hal/fallback/FallbackScreenConfiguration.cpp
+++ b/system/hardware/fallback/FallbackScreenConfiguration.cpp
diff --git a/hal/fallback/FallbackScreenPower.cpp b/system/hardware/fallback/FallbackScreenPower.cpp
index 62963f23a..62963f23a 100644
--- a/hal/fallback/FallbackScreenPower.cpp
+++ b/system/hardware/fallback/FallbackScreenPower.cpp
diff --git a/hal/fallback/FallbackSensor.cpp b/system/hardware/fallback/FallbackSensor.cpp
index 543080e92..543080e92 100644
--- a/hal/fallback/FallbackSensor.cpp
+++ b/system/hardware/fallback/FallbackSensor.cpp
diff --git a/hal/fallback/FallbackSwitch.cpp b/system/hardware/fallback/FallbackSwitch.cpp
index 38d6a50e9..38d6a50e9 100644
--- a/hal/fallback/FallbackSwitch.cpp
+++ b/system/hardware/fallback/FallbackSwitch.cpp
diff --git a/hal/fallback/FallbackSystemService.cpp b/system/hardware/fallback/FallbackSystemService.cpp
index 503f58e2d..503f58e2d 100644
--- a/hal/fallback/FallbackSystemService.cpp
+++ b/system/hardware/fallback/FallbackSystemService.cpp
diff --git a/hal/fallback/FallbackThreadPriority.cpp b/system/hardware/fallback/FallbackThreadPriority.cpp
index dce5dfa82..dce5dfa82 100644
--- a/hal/fallback/FallbackThreadPriority.cpp
+++ b/system/hardware/fallback/FallbackThreadPriority.cpp
diff --git a/hal/fallback/FallbackTime.cpp b/system/hardware/fallback/FallbackTime.cpp
index a2c56e817..a2c56e817 100644
--- a/hal/fallback/FallbackTime.cpp
+++ b/system/hardware/fallback/FallbackTime.cpp
diff --git a/hal/fallback/FallbackWakeLocks.cpp b/system/hardware/fallback/FallbackWakeLocks.cpp
index 8e4060516..8e4060516 100644
--- a/hal/fallback/FallbackWakeLocks.cpp
+++ b/system/hardware/fallback/FallbackWakeLocks.cpp
diff --git a/hal/linux/LinuxMemory.cpp b/system/hardware/linux/LinuxMemory.cpp
index 14ed63146..14ed63146 100644
--- a/hal/linux/LinuxMemory.cpp
+++ b/system/hardware/linux/LinuxMemory.cpp
diff --git a/hal/linux/LinuxPower.cpp b/system/hardware/linux/LinuxPower.cpp
index 626d1ac0c..626d1ac0c 100644
--- a/hal/linux/LinuxPower.cpp
+++ b/system/hardware/linux/LinuxPower.cpp
diff --git a/hal/moz.build b/system/hardware/moz.build
index 1aecdb750..1aecdb750 100644
--- a/hal/moz.build
+++ b/system/hardware/moz.build
diff --git a/hal/sandbox/PHal.ipdl b/system/hardware/sandbox/PHal.ipdl
index 5fa2b2b97..5fa2b2b97 100644
--- a/hal/sandbox/PHal.ipdl
+++ b/system/hardware/sandbox/PHal.ipdl
diff --git a/hal/sandbox/SandboxHal.cpp b/system/hardware/sandbox/SandboxHal.cpp
index 9a214f085..9a214f085 100644
--- a/hal/sandbox/SandboxHal.cpp
+++ b/system/hardware/sandbox/SandboxHal.cpp
diff --git a/hal/sandbox/SandboxHal.h b/system/hardware/sandbox/SandboxHal.h
index 8ac8e46ad..8ac8e46ad 100644
--- a/hal/sandbox/SandboxHal.h
+++ b/system/hardware/sandbox/SandboxHal.h
diff --git a/hal/windows/WindowsSensor.cpp b/system/hardware/windows/WindowsSensor.cpp
index 302ad7c48..302ad7c48 100644
--- a/hal/windows/WindowsSensor.cpp
+++ b/system/hardware/windows/WindowsSensor.cpp
diff --git a/system/moz.build b/system/moz.build
index 25fd714d1..67ceb5d7e 100644
--- a/system/moz.build
+++ b/system/moz.build
@@ -6,6 +6,7 @@
 DIRS += [
   'docshell',
   'graphics',
+  'hardware',
   'interface',
   'security',
 ]
diff --git a/system/toolkit.mozbuild b/system/toolkit.mozbuild
index db3cdf8be..1fcfe18cd 100644
--- a/system/toolkit.mozbuild
+++ b/system/toolkit.mozbuild
@@ -20,7 +20,6 @@ if CONFIG['MOZ_AUTH_EXTENSION']:
 DIRS += [
     '/ipc',
     '/js/ipc',
-    '/hal',
     '/js/xpconnect',
     '/intl/chardet',
     '/libs/libyuv',