LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Allow adding blocks of texts to the Android.bp file." am: 089f93dcec am: 259f311b40 am: 65e333b054

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/development/+/1734013

Change-Id: I760ffa93ec9d0ac785cab0e1ca92d5ae5b89a5d3
This commit is contained in:
Joel Galenson
2021-06-21 20:12:55 +00:00
committed by Automerger Merge Worker
parent f728fb61f6 65e333b054
commit 2b21bd3be9
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/cargo2android.py
View File

@@ -659,6 +659,9 @@ class Crate(object):
self.write(' ],') self.write(' ],')
if self.runner.args.min_sdk_version and crate_type == 'lib': if self.runner.args.min_sdk_version and crate_type == 'lib':
self.write(' min_sdk_version: "%s",' % self.runner.args.min_sdk_version) self.write(' min_sdk_version: "%s",' % self.runner.args.min_sdk_version)
if self.runner.args.add_module_block:
with open(self.runner.args.add_module_block, 'r') as f:
self.write(' %s,' % f.read().replace('\n', '\n '))
self.write('}') self.write('}')
def dump_android_flags(self): def dump_android_flags(self):
@@ -1377,6 +1380,9 @@ class Runner(object):
if lib_name not in dumped_libs: if lib_name not in dumped_libs:
dumped_libs.add(lib_name) dumped_libs.add(lib_name)
lib.dump() lib.dump()
if self.args.add_toplevel_block:
with open(self.args.add_toplevel_block, 'r') as f:
self.append_to_bp('\n' + f.read() + '\n')
if self.args.dependencies and self.dependencies: if self.args.dependencies and self.dependencies:
self.dump_dependencies() self.dump_dependencies()
if self.errors: if self.errors:
@@ -1635,6 +1641,14 @@ def get_parser():
nargs='*', nargs='*',
default=[], default=[],
help='Do not emit the given cfg.') help='Do not emit the given cfg.')
parser.add_argument(
'--add-toplevel-block',
type=str,
help='Add the contents of the given file to the top level of the Android.bp.')
parser.add_argument(
'--add-module-block',
type=str,
help='Add the contents of the given file to the main module.')
parser.add_argument( parser.add_argument(
'--no-test-mapping', '--no-test-mapping',
action='store_true', action='store_true',