Bug 996780 - Use ANDROID_TARGET_SDK for Eclipse project target. r=nalexander
☠☠ backed out by 3be10cad99a8 ☠ ☠
authorJim Chen <nchen@mozilla.com>
Tue, 15 Apr 2014 13:43:00 +0200
changeset 179200 16fc740d96f5e79eefeda968f6fa88bf37d4b2a0
parent 179199 6f221ba93943b5d0b494e87586bdc7220d61da82
child 179201 d49f986956abcb6bd4fc9ea28d03a7e9df1a951c
push id272
push userpvanderbeken@mozilla.com
push dateMon, 05 May 2014 16:31:18 +0000
reviewersnalexander
bugs996780
milestone31.0a1
Bug 996780 - Use ANDROID_TARGET_SDK for Eclipse project target. r=nalexander
python/mozbuild/mozbuild/backend/android_eclipse.py
python/mozbuild/mozbuild/backend/templates/android_eclipse/project.properties
--- a/python/mozbuild/mozbuild/backend/android_eclipse.py
+++ b/python/mozbuild/mozbuild/backend/android_eclipse.py
@@ -233,16 +233,17 @@ class AndroidEclipseBackend(CommonBacken
         defines['IDE_PROJECT_LIBRARY_REFERENCES'] = '\n'.join(
             'android.library.reference.%s=%s' % (i + 1, ref)
             for i, ref in enumerate(sorted(data.included_projects)))
         if data.filtered_resources:
             filteredResources = self._Element_for_filtered_resources(data.filtered_resources)
             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)
         for input_filename, f in itertools.chain(finder.find('**'), finder.find('.**')):
             if input_filename == 'AndroidManifest.xml' and not data.is_library:
                 # Main projects supply their own manifests.
                 continue
             copier.add(input_filename, PreprocessedFile(
--- a/python/mozbuild/mozbuild/backend/templates/android_eclipse/project.properties
+++ b/python/mozbuild/mozbuild/backend/templates/android_eclipse/project.properties
@@ -4,11 +4,11 @@
 #
 # This file must be checked in Version Control Systems.
 #
 # To customize properties used by the Ant build system edit
 # "ant.properties", and override values to adapt the script to your
 # project structure.
 
 # Project target.
-target=android-16
+target=android-@ANDROID_TARGET_SDK@
 @IDE_PROJECT_LIBRARY_SETTING@
 @IDE_PROJECT_LIBRARY_REFERENCES@