Bug 1213480 - b2gdroid builds broken after bug 1201206 r=nalexander
authorFabrice Desré <fabrice@mozilla.com>
Fri, 09 Oct 2015 16:34:16 -0700
changeset 300460 370e515aa882be1a70f9b16e71d2f662683eed2d
parent 300459 8d49a792ec000e6d51f9c5a3580e1146a21a6dad
child 300461 9f8c18106b1190489a5be68289569dfdba133e53
push id5392
push userraliiev@mozilla.com
push dateMon, 14 Dec 2015 20:08:23 +0000
treeherdermozilla-beta@16ce8562a975 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1213480, 1201206
milestone44.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 1213480 - b2gdroid builds broken after bug 1201206 r=nalexander
mobile/android/b2gdroid/app/Makefile.in
mobile/android/b2gdroid/app/moz.build
mobile/android/b2gdroid/app/src/main/java/org/mozilla/b2gdroid/Launcher.java
--- a/mobile/android/b2gdroid/app/Makefile.in
+++ b/mobile/android/b2gdroid/app/Makefile.in
@@ -24,16 +24,17 @@ jars_dir := $(DEPTH)/mobile/android/base
 ANDROID_EXTRA_JARS := $(filter-out %gecko-R.jar,$(wildcard $(jars_dir)/*.jar))
 # Needed for the UpdateService
 ANDROID_EXTRA_JARS += $(ANDROID_COMPAT_LIB)
 
 ANDROID_EXTRA_JARS += \
 	$(ANDROID_SUPPORT_ANNOTATIONS_JAR_LIB) \
 	$(ANDROID_SUPPORT_V4_AAR_LIB) \
 	$(ANDROID_SUPPORT_V4_AAR_INTERNAL_LIB) \
+	$(ANDROID_APPCOMPAT_V7_AAR_LIB) \
 	$(NULL)
 
 # The GeckoView consuming APK depends on the GeckoView resources.  This hacks a
 # type of poor man's AAR support.
 .aapt.deps: .geckoview_resources.deps
 
 .geckoview_resources.deps: $(DEPTH)/mobile/android/base/geckoview_resources.zip
 	@$(TOUCH) $@
--- a/mobile/android/b2gdroid/app/moz.build
+++ b/mobile/android/b2gdroid/app/moz.build
@@ -24,11 +24,15 @@ ANDROID_ASSETS_DIRS += [
 # the transitive set of resource classes.  For now, let's assume that b2gdroid
 # will not induce accesses to other package's resources at runtime.
 ANDROID_EXTRA_PACKAGES += ['org.mozilla.gecko']
 
 if CONFIG['ANDROID_SUPPORT_V4_AAR']:
     ANDROID_EXTRA_PACKAGES += ['android.support.v4']
     ANDROID_EXTRA_RES_DIRS += ['%' + CONFIG['ANDROID_SUPPORT_V4_AAR_RES']]
 
+if CONFIG['ANDROID_APPCOMPAT_V7_AAR']:
+    ANDROID_EXTRA_PACKAGES += ['android.support.v7.appcompat']
+    ANDROID_EXTRA_RES_DIRS += ['%' + CONFIG['ANDROID_APPCOMPAT_V7_AAR_RES']]
+
 JS_PREFERENCE_FILES += [
      'b2gdroid.js',
 ]
--- a/mobile/android/b2gdroid/app/src/main/java/org/mozilla/b2gdroid/Launcher.java
+++ b/mobile/android/b2gdroid/app/src/main/java/org/mozilla/b2gdroid/Launcher.java
@@ -8,16 +8,17 @@ import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.KeyguardManager;
 import android.app.KeyguardManager.KeyguardLock;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.support.v4.app.FragmentActivity;
 import android.util.Log;
 import android.view.View;
 
 import org.json.JSONObject;
 import org.json.JSONException;
 
 import org.mozilla.gecko.BaseGeckoInterface;
 import org.mozilla.gecko.ContactService;
@@ -30,17 +31,17 @@ import org.mozilla.gecko.GeckoThread;
 import org.mozilla.gecko.IntentHelper;
 import org.mozilla.gecko.updater.UpdateServiceHelper;
 import org.mozilla.gecko.util.GeckoEventListener;
 
 import org.mozilla.b2gdroid.ScreenStateObserver;
 import org.mozilla.b2gdroid.Apps;
 import org.mozilla.b2gdroid.SettingsMapper;
 
-public class Launcher extends Activity
+public class Launcher extends FragmentActivity
                       implements GeckoEventListener, ContextGetter {
     private static final String LOGTAG = "B2G";
 
     private ContactService      mContactService;
     private ScreenStateObserver mScreenStateObserver;
     private Apps                mApps;
     private SettingsMapper      mSettings;