Bug 1233599 - Add build dependencies to appcompat-v7. r=mcomella a=sylvestre
authorNick Alexander <nalexander@mozilla.com>
Wed, 16 Dec 2015 13:57:05 -0800
changeset 310532 ab30cd81ac29347a6654140376f22f935baa9940
parent 310531 8785e7694bd0d31f23fba9b63dadc12c9924ba86
child 310533 3a5e87559868af1a0afa5ed87a27d4e3b4f630cc
push id5513
push userraliiev@mozilla.com
push dateMon, 25 Jan 2016 13:55:34 +0000
treeherdermozilla-beta@5ee97dd05b5c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmcomella, sylvestre
bugs1233599
milestone45.0a2
Bug 1233599 - Add build dependencies to appcompat-v7. r=mcomella a=sylvestre
mobile/android/base/moz.build
mobile/android/tests/browser/robocop/Makefile.in
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -26,23 +26,24 @@ constants_jar.sources = ['java/org/mozil
 constants_jar.generated_sources = [
     'preprocessed/org/mozilla/gecko/AdjustConstants.java',
     'preprocessed/org/mozilla/gecko/AppConstants.java',
 ]
 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:
     constants_jar.sources += ['java/org/mozilla/gecko/' + x for x in [
         'adjust/StubAdjustHelper.java',
     ]]
 
 resjar = add_java_jar('gecko-R')
--- a/mobile/android/tests/browser/robocop/Makefile.in
+++ b/mobile/android/tests/browser/robocop/Makefile.in
@@ -60,12 +60,17 @@ tools:: $(ANDROID_APK_NAME).apk
 # The test APK needs to know the contents of the target APK while not
 # being linked against them.  This is a best effort to avoid getting
 # out of sync with base's build config.
 jars_dir := $(DEPTH)/mobile/android/base
 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)