зеркало из https://github.com/mozilla/gecko-dev.git
Bug 975152 - Part 0: Allow res=None in AndroidEclipseProjectData. r=bnicholson
This commit is contained in:
Родитель
e958c5e661
Коммит
c45b992a8b
|
@ -122,6 +122,12 @@ class AndroidEclipseBackend(CommonBackend):
|
||||||
|
|
||||||
if project.res:
|
if project.res:
|
||||||
manifest.add_symlink(mozpath.join(srcdir, project.res), 'res')
|
manifest.add_symlink(mozpath.join(srcdir, project.res), 'res')
|
||||||
|
else:
|
||||||
|
# Eclipse expects a res directory no matter what, so we
|
||||||
|
# make an empty directory if the project doesn't specify.
|
||||||
|
res = os.path.abspath(mozpath.join(os.path.dirname(__file__),
|
||||||
|
'templates', 'android_eclipse_empty_resource_directory'))
|
||||||
|
manifest.add_pattern_copy(res, '.**', 'res')
|
||||||
|
|
||||||
if project.assets:
|
if project.assets:
|
||||||
manifest.add_symlink(mozpath.join(srcdir, project.assets), 'assets')
|
manifest.add_symlink(mozpath.join(srcdir, project.assets), 'assets')
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
This file is named such that it is ignored by Android aapt. The file
|
||||||
|
itself ensures that the AndroidEclipse build backend can create an
|
||||||
|
empty res/ directory for projects explicitly specifying that it has no
|
||||||
|
resource directory. This is necessary because the Android Eclipse
|
||||||
|
plugin requires that each project have a res/ directory.
|
Загрузка…
Ссылка в новой задаче