bug 676856 - show package name in about:buildconfig on Android r=gavin
authorBrad Lassey <blassey@mozilla.com>
Tue, 09 Aug 2011 17:16:26 -0400
changeset 75269 57b361988a3a8c2ddbfdd60b689fe2bcfe2af3b9
parent 75268 385b8dfae4c05ce2da09d70cf9b0599516b551ef
child 75270 2a9d13929af33f3895cc0ee504adcebf4b0496a4
push idunknown
push userunknown
push dateunknown
reviewersgavin
bugs676856
milestone8.0a1
bug 676856 - show package name in about:buildconfig on Android r=gavin
toolkit/content/Makefile.in
toolkit/content/buildconfig.html
--- a/toolkit/content/Makefile.in
+++ b/toolkit/content/Makefile.in
@@ -57,16 +57,20 @@ DEFINES += \
   -DCPPFLAGS="$(CPPFLAGS)" \
   $(NULL)
 
 MOZ_SOURCE_STAMP ?= $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)
 ifdef MOZ_SOURCE_STAMP
 DEFINES += -DSOURCE_CHANGESET="$(MOZ_SOURCE_STAMP)"
 endif
 
+ifeq (Android,$(OS_TARGET))
+DEFINES += -DANDROID_PACKAGE_NAME=$(ANDROID_PACKAGE_NAME)
+endif
+
 # strip a trailing slash from the repo URL because it's not always present,
 # and we want to construct a working URL in buildconfig.html
 # make+shell+sed = awful
 _dollar=$$
 SOURCE_REPO := $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
 # extra sanity check for old versions of hg
 # that don't support showconfig
 ifeq (http,$(patsubst http%,http,$(SOURCE_REPO)))
--- a/toolkit/content/buildconfig.html
+++ b/toolkit/content/buildconfig.html
@@ -91,10 +91,14 @@
       <td>@CXX@</td>
       <td>@CXX_VERSION@</td>
       <td>@CXXFLAGS@ @CPPFLAGS@</td>
     </tr>
   </tbody>
 </table>
 <h2>Configure arguments</h2>
 <p>@ac_configure_args@</p>
+#ifdef ANDROID
+<h2>Package name</h2>
+<p>@ANDROID_PACKAGE_NAME@</p>
+#endif
 </body>
 </html>