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

Merge "c2a: Automatically make crates APEX available" am: d0e21e93fb

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

Change-Id: Id74b1089aaf900cd193327e6714ceaf4125dc90e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-06-22 19:42:18 +00:00
committed by Automerger Merge Worker
parent 972cbb2a83 d0e21e93fb
commit b30e1dae5b
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/cargo2android.py
View File

@@ -709,10 +709,16 @@ class Crate(object):
for header_dir in self.runner.args.exported_c_header_dir: for header_dir in self.runner.args.exported_c_header_dir:
self.write(' "%s",' % header_dir) self.write(' "%s",' % header_dir)
self.write(' ],') self.write(' ],')
if self.runner.args.apex_available and crate_type in LIBRARY_CRATE_TYPES: if crate_type in LIBRARY_CRATE_TYPES:
self.write(' apex_available: [') self.write(' apex_available: [')
for apex in self.runner.args.apex_available: if self.runner.args.apex_available is None:
self.write(' "%s",' % apex) # If apex_available is not explicitly set, make it available to all
# apexes.
self.write(' "//apex_available:platform",')
self.write(' "//apex_available:anyapex",')
else:
for apex in self.runner.args.apex_available:
self.write(' "%s",' % apex)
self.write(' ],') self.write(' ],')
if crate_type != 'test': if crate_type != 'test':
if self.runner.args.native_bridge_supported: if self.runner.args.native_bridge_supported: