зеркало из https://github.com/mozilla/gecko-dev.git
Bug 996780 - Use ANDROID_TARGET_SDK for Eclipse project target. r=nalexander
This commit is contained in:
Родитель
d13e9068ab
Коммит
73af88dd0a
|
@ -238,6 +238,7 @@ class AndroidEclipseBackend(CommonBackend):
|
||||||
defines['IDE_PROJECT_FILTERED_RESOURCES'] = pretty_print(filteredResources).strip()
|
defines['IDE_PROJECT_FILTERED_RESOURCES'] = pretty_print(filteredResources).strip()
|
||||||
else:
|
else:
|
||||||
defines['IDE_PROJECT_FILTERED_RESOURCES'] = ''
|
defines['IDE_PROJECT_FILTERED_RESOURCES'] = ''
|
||||||
|
defines['ANDROID_TARGET_SDK'] = self.environment.substs['ANDROID_TARGET_SDK']
|
||||||
|
|
||||||
copier = FileCopier()
|
copier = FileCopier()
|
||||||
finder = FileFinder(template_directory)
|
finder = FileFinder(template_directory)
|
||||||
|
|
|
@ -9,6 +9,6 @@
|
||||||
# project structure.
|
# project structure.
|
||||||
|
|
||||||
# Project target.
|
# Project target.
|
||||||
target=android-16
|
target=android-@ANDROID_TARGET_SDK@
|
||||||
@IDE_PROJECT_LIBRARY_SETTING@
|
@IDE_PROJECT_LIBRARY_SETTING@
|
||||||
@IDE_PROJECT_LIBRARY_REFERENCES@
|
@IDE_PROJECT_LIBRARY_REFERENCES@
|
||||||
|
|
|
@ -29,6 +29,13 @@ test_data_path = mozpath.join(test_data_path, 'data')
|
||||||
|
|
||||||
|
|
||||||
CONFIGS = DefaultOnReadDict({
|
CONFIGS = DefaultOnReadDict({
|
||||||
|
'android_eclipse': {
|
||||||
|
'defines': [],
|
||||||
|
'non_global_defines': [],
|
||||||
|
'substs': [
|
||||||
|
('ANDROID_TARGET_SDK', '16'),
|
||||||
|
],
|
||||||
|
},
|
||||||
'stub0': {
|
'stub0': {
|
||||||
'defines': [
|
'defines': [
|
||||||
('MOZ_TRUE_1', '1'),
|
('MOZ_TRUE_1', '1'),
|
||||||
|
|
Загрузка…
Ссылка в новой задаче