Bug 996780 - Use ANDROID_TARGET_SDK for Eclipse project target. r=nalexander

python/mozbuild/mozbuild/backend/android_eclipse.py

@@ -238,6 +238,7 @@ class AndroidEclipseBackend(CommonBackend):
             defines['IDE_PROJECT_FILTERED_RESOURCES'] = pretty_print(filteredResources).strip()
         else:
             defines['IDE_PROJECT_FILTERED_RESOURCES'] = ''
+        defines['ANDROID_TARGET_SDK'] = self.environment.substs['ANDROID_TARGET_SDK']
 
         copier = FileCopier()
         finder = FileFinder(template_directory)

python/mozbuild/mozbuild/backend/templates/android_eclipse/project.properties

@@ -9,6 +9,6 @@
 # project structure.
 
 # Project target.
-target=android-16
+target=android-@ANDROID_TARGET_SDK@
 @IDE_PROJECT_LIBRARY_SETTING@
 @IDE_PROJECT_LIBRARY_REFERENCES@

python/mozbuild/mozbuild/test/backend/common.py

@@ -29,6 +29,13 @@ test_data_path = mozpath.join(test_data_path, 'data')
 
 
 CONFIGS = DefaultOnReadDict({
+    'android_eclipse': {
+        'defines': [],
+        'non_global_defines': [],
+        'substs': [
+            ('ANDROID_TARGET_SDK', '16'),
+        ],
+    },
     'stub0': {
         'defines': [
             ('MOZ_TRUE_1', '1'),