Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-19 09:30:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1056002 - Merge picasso and nineoldandroids jars into one (r=nalexander)

Browse Source
This commit is contained in:
Lucas Rocha 2014-09-26 13:29:14 +01:00
parent 9f76561203
commit bbea1f3637
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mobile/android/base/Makefile.in
View File

@ -81,9 +81,8 @@ ALL_JARS = \
gecko-R.jar \
gecko-browser.jar \
gecko-mozglue.jar \
gecko-thirdparty.jar \
gecko-util.jar \
nineoldandroids.jar \
squareup-picasso.jar \
sync-thirdparty.jar \
$(NULL)

24
mobile/android/base/moz.build
View File

@ -519,9 +519,8 @@ gbjar.generated_sources += sync_generated_java_files
gbjar.extra_jars = [
'gecko-R.jar',
'gecko-mozglue.jar',
'gecko-thirdparty.jar',
'gecko-util.jar',
'nineoldandroids.jar',
'squareup-picasso.jar',
'sync-thirdparty.jar',
]
@ -541,8 +540,9 @@ if CONFIG['MOZ_NATIVE_DEVICES']:
gbjar.javac_flags += ['-Xlint:all,-deprecation,-fallthrough', '-J-Xmx512m', '-J-Xms128m']
noajar = add_java_jar('nineoldandroids')
noajar.sources += [ thirdparty_source_dir + f for f in [
# gecko-thirdparty is a good place to put small independent libraries
gtjar = add_java_jar('gecko-thirdparty')
gtjar.sources += [ thirdparty_source_dir + f for f in [
'com/nineoldandroids/animation/Animator.java',
'com/nineoldandroids/animation/AnimatorInflater.java',
'com/nineoldandroids/animation/AnimatorListenerAdapter.java',
@ -570,12 +570,7 @@ noajar.sources += [ thirdparty_source_dir + f for f in [
'com/nineoldandroids/view/ViewPropertyAnimator.java',
'com/nineoldandroids/view/ViewPropertyAnimatorHC.java',
'com/nineoldandroids/view/ViewPropertyAnimatorICS.java',
'com/nineoldandroids/view/ViewPropertyAnimatorPreHC.java'
] ]
#noajar.javac_flags += ['-Xlint:all']
spjar = add_java_jar('squareup-picasso')
spjar.sources += [ thirdparty_source_dir + f for f in [
'com/nineoldandroids/view/ViewPropertyAnimatorPreHC.java',
'com/squareup/picasso/Action.java',
'com/squareup/picasso/AssetBitmapHunter.java',
'com/squareup/picasso/BitmapHunter.java',
@ -606,9 +601,10 @@ spjar.sources += [ thirdparty_source_dir + f for f in [
'com/squareup/picasso/TargetAction.java',
'com/squareup/picasso/Transformation.java',
'com/squareup/picasso/UrlConnectionDownloader.java',
'com/squareup/picasso/Utils.java',
'com/squareup/picasso/Utils.java'
] ]
#spjar.javac_flags += ['-Xlint:all']
#gtjar.javac_flags += ['-Xlint:all']
ANDROID_RES_DIRS += [
SRCDIR + '/resources',
@ -665,8 +661,8 @@ if CONFIG['MOZ_ANDROID_SEARCH_ACTIVITY']:
'gecko-R.jar',
'gecko-browser.jar',
'gecko-mozglue.jar',
'gecko-util.jar',
'nineoldandroids.jar'
'gecko-thirdparty.jar',
'gecko-util.jar'
]
generated_recursive_make_targets = ['.aapt.deps', '.locales.deps'] # Captures dependencies on Android manifest and all resources.