Bug 1220309 - Follow-up: Add build dependencies to appcompat-v7. r=mcomella

This commit is contained in:
Nick Alexander 2015-12-16 13:57:05 -08:00
parent 10b9c4ef91
commit a1703fa503
2 changed files with 7 additions and 1 deletions

View File

@ -31,13 +31,14 @@ constants_jar.extra_jars = [
CONFIG['ANDROID_SUPPORT_ANNOTATIONS_JAR_LIB'],
CONFIG['ANDROID_SUPPORT_V4_AAR_LIB'],
CONFIG['ANDROID_SUPPORT_V4_AAR_INTERNAL_LIB'],
CONFIG['ANDROID_APPCOMPAT_V7_AAR_LIB'],
]
if CONFIG['MOZ_INSTALL_TRACKING']:
constants_jar.sources += ['java/org/mozilla/gecko/' + x for x in [
'adjust/AdjustHelper.java',
]]
constants_jar.extra_jars = [
constants_jar.extra_jars += [
'gecko-thirdparty-adjust_sdk.jar',
]
else:

View File

@ -65,7 +65,12 @@ stumbler_jars_dir := $(DEPTH)/mobile/android/stumbler
ANDROID_CLASSPATH_JARS += \
$(wildcard $(jars_dir)/*.jar) \
$(wildcard $(stumbler_jars_dir)/*.jar) \
$(NULL)
# We don't have transitive dependencies: these are the browser jar
# dependencies inserted manually.
ANDROID_CLASSPATH_JARS += \
$(ANDROID_SUPPORT_V4_AAR_LIB) \
$(ANDROID_SUPPORT_V4_AAR_INTERNAL_LIB) \
$(ANDROID_RECYCLERVIEW_V7_AAR_LIB) \
$(ANDROID_APPCOMPAT_V7_AAR_LIB) \
$(NULL)