From 5ac4cd30279e498a66123ac92d7ba18acb3dddc4 Mon Sep 17 00:00:00 2001
From: Brad Lassey <blassey@mozilla.com>
Date: Tue, 26 Oct 2010 11:08:04 -0400
Subject: [PATCH] backing out 595801e1578c a=bustage-fix

---
 embedding/android/AndroidManifest.xml.in | 2 +-
 embedding/android/Makefile.in            | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/embedding/android/AndroidManifest.xml.in b/embedding/android/AndroidManifest.xml.in
index 9a0fa4b9404..0c51e24dfcc 100644
--- a/embedding/android/AndroidManifest.xml.in
+++ b/embedding/android/AndroidManifest.xml.in
@@ -3,7 +3,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.mozilla.@MOZ_APP_NAME@"
       android:installLocation="auto"
-      android:versionCode="@BUILD_ID@"
+      android:versionCode="1"
       android:versionName="@MOZ_APP_VERSION@"
       android:sharedUserId="org.mozilla.sharedID">
     <uses-sdk android:minSdkVersion="5"
diff --git a/embedding/android/Makefile.in b/embedding/android/Makefile.in
index ab5660bcaef..00d3acff913 100644
--- a/embedding/android/Makefile.in
+++ b/embedding/android/Makefile.in
@@ -65,8 +65,6 @@ else
 MIN_CPU_VERSION=5
 endif
 
-BUILD_ID = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID)
-
 DEFINES += \
   -DMOZ_APP_DISPLAYNAME=$(MOZ_APP_DISPLAYNAME) \
   -DMOZ_APP_NAME=$(MOZ_APP_NAME) \
@@ -74,7 +72,6 @@ DEFINES += \
   -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME) \
   -DMOZ_MIN_CPU_VERSION=$(MIN_CPU_VERSION) \
   -DMOZ_CRASHREPORTER=$(MOZ_CRASHREPORTER) \
-  -DBUILD_ID=$(BUILD_ID) \
   $(NULL)
 
 GARBAGE += \
@@ -126,7 +123,7 @@ classes.dex: $(JAVAFILES) $(PROCESSEDJAVAFILES) R.java
 	$(JAVAC) $(JAVAC_FLAGS) -d classes  $(addprefix $(srcdir)/,$(JAVAFILES)) $(PROCESSEDJAVAFILES) R.java
 	$(DX) --dex --output=$@ classes
 
-AndroidManifest.xml $(PROCESSEDJAVAFILES): % : %.in $(LIBXUL_DIST)/bin/platform.ini
+AndroidManifest.xml $(PROCESSEDJAVAFILES): % : %.in
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
              $(AUTOMATION_PPARGS) $(DEFINES) $(ACDEFINES) $< > $@