Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-24 10:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1207682 - Bring back android.support.v4.app.NotificationManagerCompat r=fabrice

Browse Source
This commit is contained in:
Fabrice Desré 2015-09-24 09:55:52 -07:00
parent b32ea8e77e
commit b1f264280e
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mobile/android/b2gdroid/app/Makefile.in
View File

@ -25,6 +25,12 @@ 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) \
$(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

4
mobile/android/b2gdroid/app/moz.build
View File

@ -25,6 +25,10 @@ ANDROID_ASSETS_DIRS += [
# 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']]
JS_PREFERENCE_FILES += [
'b2gdroid.js',
]