mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-24 10:45:42 +00:00
Bug 1207682 - Bring back android.support.v4.app.NotificationManagerCompat r=fabrice
This commit is contained in:
parent
b32ea8e77e
commit
b1f264280e
@ -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
|
||||
|
@ -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',
|
||||
]
|
||||
|
Loading…
Reference in New Issue
Block a user