Backed out changeset 16fc740d96f5 (bug 996780) for build test failures on a CLOSED TREE
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 16 Apr 2014 10:30:51 +0200
changeset 179203 3be10cad99a827b08b433cac25d68bd1a96c5675
parent 179202 d80acdb6ce2c4f4f979d548b456be052322455be
child 179204 dc87f47062ce7736bebfe059279517370db47d7d
push id272
push userpvanderbeken@mozilla.com
push dateMon, 05 May 2014 16:31:18 +0000
bugs996780
milestone31.0a1
backs out16fc740d96f5e79eefeda968f6fa88bf37d4b2a0
Backed out changeset 16fc740d96f5 (bug 996780) for build test failures on a CLOSED TREE
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,17 +233,16 @@ 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-@ANDROID_TARGET_SDK@
+target=android-16
 @IDE_PROJECT_LIBRARY_SETTING@
 @IDE_PROJECT_LIBRARY_REFERENCES@