Bug 1056002 - Merge picasso and nineoldandroids jars into one (r=nalexander)
authorLucas Rocha <lucasr@lucasr.org>
Fri, 26 Sep 2014 13:29:14 +0100
changeset 230673 3fb6805983a071c2c1eb8da32c712134a616edc5
parent 230636 68f76e3c578795b68cbb39da03859db13607bf79
child 230674 c56275d516ecd4a865ca6fa0f5d9c21641d92af5
push id4187
push userbhearsum@mozilla.com
push dateFri, 28 Nov 2014 15:29:12 +0000
treeherdermozilla-beta@f23cc6a30c11 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1056002
milestone35.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 1056002 - Merge picasso and nineoldandroids jars into one (r=nalexander)
mobile/android/base/Makefile.in
mobile/android/base/moz.build
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -76,19 +76,18 @@ ifdef MOZ_NATIVE_DEVICES
 endif
 
 JAVA_CLASSPATH := $(subst $(NULL) ,:,$(strip $(JAVA_CLASSPATH)))
 
 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)
 
 ifdef MOZ_WEBRTC
 ALL_JARS += webrtc.jar
 endif
 
 ifdef MOZ_ANDROID_SEARCH_ACTIVITY
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -514,19 +514,18 @@ if CONFIG['MOZ_ANDROID_SHARE_OVERLAY']:
         'overlays/ui/ShareDialog.java',
     ]
 
 gbjar.sources += sync_java_files
 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',
 ]
 
 moz_native_devices_jars = [
     CONFIG['ANDROID_APPCOMPAT_LIB'],
     CONFIG['ANDROID_MEDIAROUTER_LIB'],
     CONFIG['GOOGLE_PLAY_SERVICES_LIB'],
 ]
@@ -536,18 +535,19 @@ moz_native_devices_sources = [
     'MediaPlayerManager.java',
 ]
 if CONFIG['MOZ_NATIVE_DEVICES']:
     gbjar.extra_jars += moz_native_devices_jars
     gbjar.sources += moz_native_devices_sources
 
 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',
     'com/nineoldandroids/animation/AnimatorSet.java',
     'com/nineoldandroids/animation/ArgbEvaluator.java',
     'com/nineoldandroids/animation/FloatEvaluator.java',
     'com/nineoldandroids/animation/FloatKeyframeSet.java',
     'com/nineoldandroids/animation/IntEvaluator.java',
@@ -565,22 +565,17 @@ noajar.sources += [ thirdparty_source_di
     'com/nineoldandroids/util/NoSuchPropertyException.java',
     'com/nineoldandroids/util/Property.java',
     'com/nineoldandroids/util/ReflectiveProperty.java',
     'com/nineoldandroids/view/animation/AnimatorProxy.java',
     'com/nineoldandroids/view/ViewHelper.java',
     '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',
     'com/squareup/picasso/Cache.java',
     'com/squareup/picasso/Callback.java',
     'com/squareup/picasso/ContactsPhotoBitmapHunter.java',
     'com/squareup/picasso/ContentStreamBitmapHunter.java',
     'com/squareup/picasso/DeferredRequestCreator.java',
@@ -601,19 +596,20 @@ spjar.sources += [ thirdparty_source_dir
     'com/squareup/picasso/RequestCreator.java',
     'com/squareup/picasso/ResourceBitmapHunter.java',
     'com/squareup/picasso/Stats.java',
     'com/squareup/picasso/StatsSnapshot.java',
     'com/squareup/picasso/Target.java',
     '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',
     TOPSRCDIR + '/' + CONFIG['MOZ_BRANDING_DIRECTORY'] + '/res',
     OBJDIR + '/res',
 ]
 
 ANDROID_GENERATED_RESFILES += [
@@ -660,18 +656,18 @@ if CONFIG['MOZ_ANDROID_SEARCH_ACTIVITY']
 
     search_activity = add_java_jar('search-activity')
     search_activity.sources += [search_source_dir + '/' + f for f in search_activity_sources]
     search_activity.javac_flags += ['-Xlint:all']
     search_activity.extra_jars = [
         '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.
 
 generated = add_android_eclipse_library_project('FennecResourcesGenerated')
 generated.package_name = 'org.mozilla.gecko.generated'
 generated.res = OBJDIR + '/res'
 generated.recursive_make_targets += generated_recursive_make_targets