Deprecate the --dependencies argument.
We no longer use the --dependencies argument, but it is still used in
a number of places. Let's remove its functionality but keep the
command-line option as a no-op so we can remove the uses over time.
Test: Run on crate that uses the option.
Change-Id: I954f68faf11d1a926f0ccf070afa8332385e3671
diff --git a/scripts/cargo2android.py b/scripts/cargo2android.py
index 6e63ca1..fef1d51 100755
--- a/scripts/cargo2android.py
+++ b/scripts/cargo2android.py
@@ -1101,7 +1101,6 @@
# pkg_obj2cc[cc_object[i].pkg][cc_objects[i].obj] = cc_objects[i]
self.ar_objects = list()
self.crates = list()
- self.dependencies = list() # dependent and build script crates
self.warning_files = set()
# Keep a unique mapping from (module name) to crate
self.name_owners = {}
@@ -1359,20 +1358,6 @@
os.rename(cargo_lock_saved, cargo_lock)
return self
- def dump_dependencies(self):
- """Append dependencies and their features to Android.bp."""
- if not self.dependencies:
- return
- dependent_list = list()
- for c in self.dependencies:
- dependent_list.append(c.feature_list())
- sorted_dependencies = sorted(set(dependent_list))
- self.init_bp_file('Android.bp')
- with open('Android.bp', 'a') as outf:
- outf.write('\n// dependent_library ["feature_list"]\n')
- for s in sorted_dependencies:
- outf.write('// ' + s + '\n')
-
def dump_pkg_obj2cc(self):
"""Dump debug info of the pkg_obj2cc map."""
if not self.args.debug:
@@ -1433,8 +1418,6 @@
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:
- self.dump_dependencies()
if self.errors:
self.append_to_bp('\n' + ERRORS_LINE + '\n' + self.errors)
return self
@@ -1450,10 +1433,6 @@
if crate.skip_crate():
if self.args.debug: # include debug info of all crates
self.crates.append(crate)
- if self.args.dependencies: # include only dependent crates
- if (is_dependent_file_path(crate.main_src) and
- not is_build_crate_name(crate.crate_name)):
- self.dependencies.append(crate)
else:
for c in self.crates:
if c.merge(crate, 'Android.bp'):
@@ -1589,7 +1568,7 @@
'--dependencies',
action='store_true',
default=False,
- help='dump debug info of dependent crates')
+ help='Deprecated. Has no effect.')
parser.add_argument(
'--device',
action='store_true',
