Bug 711627: ContentProvider Authority string needs to be preprocessed [r=mfinkle]
authorSriram Ramasubramanian <sriram@mozilla.com>
Fri, 16 Dec 2011 14:50:34 -0800
changeset 84588 85599a814c0267d7bd7fddc2e15850ec03e8a2e1
parent 84587 582df079dff0811f297a11523b769f24f9f07c61
child 84589 f2b8e484ebaa297e8618165c35a70abba4560033
push id519
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 00:38:35 +0000
treeherdermozilla-beta@788ea1ef610b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs711627
milestone11.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 711627: ContentProvider Authority string needs to be preprocessed [r=mfinkle]
mobile/android/base/Makefile.in
mobile/android/base/db/BrowserContract.java
mobile/android/base/db/BrowserContract.java.in
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -50,17 +50,16 @@ DIST_FILES = package-name.txt
 JAVAFILES = \
   AboutHomeContent.java \
   AlertNotification.java \
   AutoCompletePopup.java \
   AwesomeBar.java \
   AwesomeBarTabs.java \
   BrowserToolbar.java \
   ConfirmPreference.java \
-  db/BrowserContract.java \
   db/AndroidBrowserDB.java \
   db/BrowserDB.java \
   db/LocalBrowserDB.java \
   DoorHanger.java \
   DoorHangerPopup.java \
   Favicons.java \
   FloatUtils.java \
   GeckoActionBar.java \
@@ -110,16 +109,17 @@ JAVAFILES = \
   ui/PanZoomController.java \
   $(NULL)
 
 PROCESSEDJAVAFILES = \
   App.java \
   LauncherShortcuts.java \
   NotificationHandler.java \
   Restarter.java \
+  db/BrowserContract.java \
   db/BrowserProvider.java \
   $(NULL)
 
 
 ifneq (,$(findstring -march=armv7,$(OS_CFLAGS)))
 MIN_CPU_VERSION=7
 else
 MIN_CPU_VERSION=5
rename from mobile/android/base/db/BrowserContract.java
rename to mobile/android/base/db/BrowserContract.java.in
--- a/mobile/android/base/db/BrowserContract.java
+++ b/mobile/android/base/db/BrowserContract.java.in
@@ -30,22 +30,23 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
+#filter substitution
 package org.mozilla.gecko.db;
 
 import android.net.Uri;
 
 public class BrowserContract {
-    public static final String AUTHORITY = "org.mozilla.gecko.providers.browser";
+    public static final String AUTHORITY = "@ANDROID_PACKAGE_NAME@.db.browser";
 
     public static final Uri AUTHORITY_URI = Uri.parse("content://" + AUTHORITY);
 
     public static final String DEFAULT_PROFILE = "default";
 
     public static final String PARAM_PROFILE = "profile";
 
     public static final String PARAM_LIMIT = "limit";