Bug 1259098 - Build with SDK 26 on Android draft
authorJames Willcox <snorp@snorp.net>
Mon, 07 Aug 2017 17:01:12 -0500
changeset 654424 78d2af77789b6ee3b72b05d056539159247a56b5
parent 654398 3529b653ede26f990eb7320649015294ad0f8e76
child 654425 571321113f28ff527d9ccd2e23ebff6aa05dc4c6
push id76581
push userbmo:snorp@snorp.net
push dateMon, 28 Aug 2017 21:02:22 +0000
bugs1259098
milestone57.0a1
Bug 1259098 - Build with SDK 26 on Android MozReview-Commit-ID: IjFGdABpZWo
mobile/android/base/moz.build
mobile/android/bouncer/java/org/mozilla/bouncer/BouncerService.java
mobile/android/stumbler/moz.build
mobile/android/tests/browser/junit3/moz.build
old-configure.in
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -1427,17 +1427,17 @@ if CONFIG['MOZ_ANDROID_SEARCH_ACTIVITY']
     # The Search Activity is mostly independent of Fennec proper, but
     # it does depend on Geckoview.  Therefore, we build it as a jar
     # that depends on the Geckoview jars.
     search_source_dir = SRCDIR + '/../search'
     include('../search/search_activity_sources.mozbuild')
 
     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.javac_flags += ['-Xlint:all,-deprecation']
     search_activity.extra_jars = [
         CONFIG['ANDROID_SUPPORT_ANNOTATIONS_JAR_LIB'],
         CONFIG['ANDROID_SUPPORT_V4_AAR_LIB'],
         CONFIG['ANDROID_SUPPORT_V4_AAR_INTERNAL_LIB'],
         'constants.jar',
         'gecko-R.jar',
         'gecko-browser.jar',
         'gecko-mozglue.jar',
@@ -1465,17 +1465,17 @@ gvjar.sources += ['generated/org/mozilla
 if CONFIG['MOZ_ANDROID_HLS_SUPPORT']:
     gvjar.extra_jars += [
         'exoplayer2.jar',
     ]
 
     exoplayer2_jar = add_java_jar('exoplayer2')
 
     exoplayer2_jar.javac_flags += [
-        '-Xlint:all,-serial,-rawtypes,-unchecked,-fallthrough',
+        '-Xlint:all,-serial,-rawtypes,-unchecked,-fallthrough,-deprecation',
     ]
 
     exoplayer2_jar.extra_jars += [
         CONFIG['ANDROID_SUPPORT_ANNOTATIONS_JAR_LIB'],
     ]
 
     exoplayer2_jar.sources += [geckoview_thirdparty_source_dir + 'java/com/google/android/exoplayer2/' + x for x in [
         'audio/Ac3Util.java',
--- a/mobile/android/bouncer/java/org/mozilla/bouncer/BouncerService.java
+++ b/mobile/android/bouncer/java/org/mozilla/bouncer/BouncerService.java
@@ -90,20 +90,16 @@ public class BouncerService extends Inte
                 getFiles(path + "/" + file, acc);
             }
         } else {
             // We're a file -- accumulate.
             acc.add(path);
         }
     }
 
-    private String getDataDir() {
-        return getApplicationInfo().dataDir;
-    }
-
     private File getDataFile(final String path) {
         File outFile = new File(getDataDir(), path);
         File dir = outFile.getParentFile();
 
         if (dir != null && !dir.exists()) {
             Log.d(LOGTAG, "Creating " + dir.getAbsolutePath());
             if (!dir.mkdirs()) {
                 Log.e(LOGTAG, "Unable to create directories: " + dir.getAbsolutePath());
--- a/mobile/android/stumbler/moz.build
+++ b/mobile/android/stumbler/moz.build
@@ -7,9 +7,9 @@
 with Files('**'):
     BUG_COMPONENT = ('Android Background Services', 'Geolocation')
 
 include('stumbler_sources.mozbuild')
 
 stumbler_jar = add_java_jar('stumbler')
 stumbler_jar.sources += stumbler_sources
 stumbler_jar.extra_jars += [CONFIG['ANDROID_SUPPORT_V4_AAR_LIB']]
-stumbler_jar.javac_flags += ['-Xlint:all']
+stumbler_jar.javac_flags += ['-Xlint:all,-deprecation']
--- a/mobile/android/tests/browser/junit3/moz.build
+++ b/mobile/android/tests/browser/junit3/moz.build
@@ -26,17 +26,17 @@ jar.sources += [
     'src/org/mozilla/tests/browser/junit3/TestGeckoProfilesProvider.java',
     'src/org/mozilla/tests/browser/junit3/TestGeckoSharedPrefs.java',
     'src/org/mozilla/tests/browser/junit3/TestImageDownloader.java',
     'src/org/mozilla/tests/browser/junit3/TestJarReader.java',
     'src/org/mozilla/tests/browser/junit3/TestRawResource.java',
     'src/org/mozilla/tests/browser/junit3/TestSuggestedSites.java',
 ]
 jar.generated_sources = [] # None yet -- try to keep it this way.
-jar.javac_flags += ['-Xlint:all']
+jar.javac_flags += ['-Xlint:all,-deprecation']
 
 jar.extra_jars += [
     CONFIG['ANDROID_SUPPORT_V4_AAR_LIB'],
     CONFIG['ANDROID_RECYCLERVIEW_V7_AAR_LIB'],
     TOPOBJDIR + '/mobile/android/base/constants.jar',
     TOPOBJDIR + '/mobile/android/base/gecko-R.jar',
     TOPOBJDIR + '/mobile/android/base/gecko-browser.jar',
     TOPOBJDIR + '/mobile/android/base/gecko-mozglue.jar',
--- a/old-configure.in
+++ b/old-configure.in
@@ -2219,17 +2219,17 @@ AC_SUBST(MOZ_MULET)
 
 dnl ========================================================
 dnl Ensure Android SDK and build-tools versions depending on
 dnl mobile target.
 dnl ========================================================
 
 case "$MOZ_BUILD_APP" in
 mobile/android)
-    MOZ_ANDROID_SDK(23, 23, 23.0.3 23.0.1, 25.3.2 25.3.1)
+    MOZ_ANDROID_SDK(26, 26, 26.0.1, 26.0.1)
     ;;
 esac
 
 dnl ========================================================
 dnl =
 dnl = Toolkit Options
 dnl =
 dnl ========================================================