StarMirror/sandboxed-api
1
0
Fork 0
mirror of https://github.com/google/sandboxed-api.git synced 2024-03-22 13:11:30 +08:00
Code Issues Projects Releases Wiki Activity

Allow empty sapi_embedded_dir flag in the header generator - empty sapi_embedded_name still disallowed

Browse Source 
PiperOrigin-RevId: 338656398
Change-Id: Ib2ca3d63ff9bed654669d948286f73d430753a20
This commit is contained in:
Maciej Szawłowski 2020-10-23 05:35:34 -07:00 committed by Copybara-Service
parent 040d76be28
commit 28bb32add6
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sandboxed_api/tools/generator2/code.py
View File

@ -19,12 +19,12 @@ from __future__ import print_function
from ctypes import util from ctypes import util
import itertools import itertools
import os import os
from clang import cindex
# pylint: disable=unused-import # pylint: disable=unused-import
from typing import (Text, List, Optional, Set, Dict, Callable, IO, Generator as from typing import (Text, List, Optional, Set, Dict, Callable, IO, Generator as
Gen, Tuple, Union, Sequence) Gen, Tuple, Union, Sequence)
# pylint: enable=unused-import # pylint: enable=unused-import
from clang import cindex
_PARSE_OPTIONS = ( _PARSE_OPTIONS = (
cindex.TranslationUnit.PARSE_SKIP_FUNCTION_BODIES cindex.TranslationUnit.PARSE_SKIP_FUNCTION_BODIES
@ -909,7 +909,8 @@ class Generator(object):
result.append('#include "sandboxed_api/sandbox.h"') result.append('#include "sandboxed_api/sandbox.h"')
result.append('#include "sandboxed_api/vars.h"') result.append('#include "sandboxed_api/vars.h"')
if embed_dir and embed_name: if embed_name:
embed_dir = embed_dir or ''
result.append( result.append(
Generator.EMBED_INCLUDE.format( Generator.EMBED_INCLUDE.format(
os.path.join(embed_dir, embed_name) + '_embed.h')) os.path.join(embed_dir, embed_name) + '_embed.h'))
@ -926,7 +927,7 @@ class Generator(object):
result.append('') result.append('')
if embed_dir and embed_name: if embed_name:
result.append( result.append(
Generator.EMBED_CLASS.format(name, embed_name.replace('-', '_'))) Generator.EMBED_CLASS.format(name, embed_name.replace('-', '_')))