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

Merge "Add Rust proc-macros to host snapshot update.py" am: ffb96b63ef am: aa52716392

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

Change-Id: Ieeec48a0938001b1795eee666ec4628fc49f32cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ivan Lozano
2022-03-29 14:32:50 +00:00
committed by Automerger Merge Worker
parent 98f38b55ae aa52716392
commit b1c9f7f199
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
vendor_snapshot/update.py
View File

@@ -110,6 +110,7 @@ JSON_TO_BP = {
'RuntimeLibs': 'runtime_libs',
'Required': 'required',
'Filename': 'filename',
'CrateName': 'crate_name',
}
SANITIZER_VARIANT_PROPS = {
@@ -409,18 +410,25 @@ def convert_json_host_data_to_bp(mod, install_dir):
mod: JSON definition of the module
install_dir: installation directory of the host snapshot
"""
rust_proc_macro = mod.pop('RustProcMacro', False)
prop = convert_json_data_to_bp_prop(mod, install_dir)
prop['host_supported'] = True
prop['device_supported'] = False
if not rust_proc_macro:
prop['host_supported'] = True
prop['device_supported'] = False
prop['stl'] = 'none'
prop['prefer'] = True
prop['stl'] = 'none'
## Move install file to host source file
prop['target'] = dict()
prop['target']['host'] = dict()
prop['target']['host']['srcs'] = [prop['filename']]
del prop['filename']
bp = 'cc_prebuilt_binary {\n' + gen_bp_prop(prop, INDENT) + '}\n\n'
mod_type = 'cc_prebuilt_binary'
if rust_proc_macro:
mod_type = 'rust_prebuilt_proc_macro'
bp = mod_type + ' {\n' + gen_bp_prop(prop, INDENT) + '}\n\n'
return bp
def gen_host_bp_file(install_dir):