Bug 1058101 - Flatten dom/icc/src/ into parent directory. r=mccr8
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Wed, 27 Aug 2014 10:12:15 -0700
changeset 224369 f6b1c86890edd66c00f766a1217e838ff2673b39
parent 224368 55629555112da5ae912ad673846205059b5d376b
child 224370 1f5efe10c3c174f77a5a35a82883a4ca710b0d50
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmccr8
bugs1058101
milestone34.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1058101 - Flatten dom/icc/src/ into parent directory. r=mccr8
dom/icc/Icc.cpp
dom/icc/Icc.h
dom/icc/IccListener.cpp
dom/icc/IccListener.h
dom/icc/IccManager.cpp
dom/icc/IccManager.h
dom/icc/moz.build
dom/icc/src/Icc.cpp
dom/icc/src/Icc.h
dom/icc/src/IccListener.cpp
dom/icc/src/IccListener.h
dom/icc/src/IccManager.cpp
dom/icc/src/IccManager.h
dom/icc/src/moz.build
rename from dom/icc/src/Icc.cpp
rename to dom/icc/Icc.cpp
rename from dom/icc/src/Icc.h
rename to dom/icc/Icc.h
rename from dom/icc/src/IccListener.cpp
rename to dom/icc/IccListener.cpp
rename from dom/icc/src/IccListener.h
rename to dom/icc/IccListener.h
rename from dom/icc/src/IccManager.cpp
rename to dom/icc/IccManager.cpp
rename from dom/icc/src/IccManager.h
rename to dom/icc/IccManager.h
--- a/dom/icc/moz.build
+++ b/dom/icc/moz.build
@@ -1,7 +1,28 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
-DIRS += ['interfaces', 'src']
+DIRS += ['interfaces']
+
+EXPORTS.mozilla.dom += [
+    'Icc.h',
+    'IccManager.h',
+]
+
+SOURCES += [
+    'Icc.cpp',
+    'IccListener.cpp',
+    'IccManager.cpp',
+]
+
+FAIL_ON_WARNINGS = True
+
+include('/ipc/chromium/chromium-config.mozbuild')
+
+FINAL_LIBRARY = 'xul'
+
+LOCAL_INCLUDES += [
+    '/dom/system/gonk',
+]
deleted file mode 100644
--- a/dom/icc/src/moz.build
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-
-EXPORTS.mozilla.dom += [
-    'Icc.h',
-    'IccManager.h',
-]
-
-SOURCES += [
-    'Icc.cpp',
-    'IccListener.cpp',
-    'IccManager.cpp',
-]
-
-FAIL_ON_WARNINGS = True
-
-include('/ipc/chromium/chromium-config.mozbuild')
-
-FINAL_LIBRARY = 'xul'
-
-LOCAL_INCLUDES += [
-    '../../system/gonk',
-]
-