Bug 1224000 - Install defaults/permissions file under browser/ instead of under browser/chrome/browser. r=mshal,r=MattN, a=lizzard
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 12 Nov 2015 08:02:21 +0900
changeset 305683 786c011b2594a1ede907795c3c02bddba33fba10
parent 305682 83c6c9ed4fa435fe94e4fa1881679568c92933d3
child 305684 0607729b3d90d03396de1aacb82571d19dafe06e
push id1001
push userraliiev@mozilla.com
push dateMon, 18 Jan 2016 19:06:03 +0000
treeherdermozilla-release@8b89261f3ac4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal, MattN, lizzard
bugs1224000
milestone44.0a2
Bug 1224000 - Install defaults/permissions file under browser/ instead of under browser/chrome/browser. r=mshal,r=MattN, a=lizzard And restore resource://app/ to its true meaning.
browser/app/jar.mn
browser/app/moz.build
browser/installer/package-manifest.in
deleted file mode 100644
--- a/browser/app/jar.mn
+++ /dev/null
@@ -1,3 +0,0 @@
-browser.jar:
-% resource app %
-  defaults/permissions (permissions)
--- a/browser/app/moz.build
+++ b/browser/app/moz.build
@@ -16,16 +16,17 @@ JS_PREFERENCE_FILES += [
 ]
 
 SOURCES += [
     'nsBrowserApp.cpp',
 ]
 
 FINAL_TARGET_FILES += ['blocklist.xml']
 FINAL_TARGET_FILES.defaults.profile += ['profile/prefs.js']
+FINAL_TARGET_FILES.defaults += ['permissions']
 
 DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
 
 GENERATED_INCLUDES += [
     '/build',
 ]
 
 LOCAL_INCLUDES += [
@@ -68,12 +69,10 @@ if CONFIG['OS_ARCH'] == 'WINNT' and not 
 DISABLE_STL_WRAPPING = True
 
 if CONFIG['MOZ_LINKER']:
     OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']
 
 if CONFIG['HAVE_CLOCK_MONOTONIC']:
     OS_LIBS += CONFIG['REALTIME_LIBS']
 
-JAR_MANIFESTS += ['jar.mn']
-
 if CONFIG['GNU_CXX']:
     CXXFLAGS += ['-Wshadow']
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -703,16 +703,17 @@
 
 ; [Default Preferences]
 ; All the pref files must be part of base to prevent migration bugs
 @RESPATH@/browser/@PREF_DIR@/firefox.js
 @RESPATH@/browser/@PREF_DIR@/firefox-branding.js
 @RESPATH@/greprefs.js
 @RESPATH@/defaults/autoconfig/prefcalls.js
 @RESPATH@/browser/defaults/profile/prefs.js
+@RESPATH@/browser/defaults/permissions
 
 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
 ; Technically this is an app pref file, but we are keeping it in the original
 ; gre location for now.
 @RESPATH@/defaults/pref/channel-prefs.js
 
 ; Services (gre) prefs
 #ifdef MOZ_SERVICES_NOTIFICATIONS