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

Merge "NFC: Refactor a string so we can add a comment to it."

Browse Source
This commit is contained in:
Treehugger Robot
2021-04-07 22:15:50 +00:00
committed by Gerrit Code Review
parent 4d82acfeee 3f42f80970
commit ad8e4d2a7e
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/cargo2android.py
View File

@@ -95,6 +95,9 @@ ANDROID_BP_HEADER = (
CARGO_OUT = 'cargo.out' # Name of file to keep cargo build -v output. CARGO_OUT = 'cargo.out' # Name of file to keep cargo build -v output.
# This should be kept in sync with tools/external_updater/crates_updater.py.
ERRORS_LINE = 'Errors in ' + CARGO_OUT + ':'
TARGET_TMP = 'target.tmp' # Name of temporary output directory. TARGET_TMP = 'target.tmp' # Name of temporary output directory.
# Message to be displayed when this script is called without the --run flag. # Message to be displayed when this script is called without the --run flag.
@@ -1357,7 +1360,7 @@ class Runner(object):
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:
self.append_to_bp('\nErrors in ' + CARGO_OUT + ':\n' + self.errors) self.append_to_bp('\n' + ERRORS_LINE + '\n' + self.errors)
return self return self
def add_ar_object(self, obj): def add_ar_object(self, obj):