Remove Android.mk from bump.py

The file no longer exists and everything is handled in the Android.bp
file instead. The script was previously modified to handle the
Android.bp file.

Test: build/make/tools/finalization/build-step-0-and-m.sh cf_x86_64_phone
Bug: 331696132
Change-Id: I08bd6d40fd4b003d9c5f927e06288922c5e16202
This commit is contained in:
Devin Moore
2024-10-11 23:12:58 +00:00
parent cba986107b
commit 3227acc073

View File

@@ -58,7 +58,6 @@ class Bump(object):
self.bump_kernel_configs()
self.copy_matrix()
self.edit_android_bp()
self.edit_android_mk()
self.bump_libvintf()
def bump_kernel_configs(self):
@@ -127,28 +126,6 @@ class Bump(object):
with open(android_bp, "w") as f:
f.write("".join(lines))
# This Android.mk file may be deprecated soon and the functionality is
# replaced by the soong phony module system_compatibility_matrix.xml.
def edit_android_mk(self):
android_mk = self.interfaces_dir / "compatibility_matrices/Android.mk"
lines = []
with open(android_mk) as f:
if self.next_module_name in f.read():
return
f.seek(0)
for line in f:
if f" {self.device_module_name} \\\n" in line:
lines.append(f" {self.current_module_name} \\\n")
if self.current_module_name in line:
lines.append(f" {self.next_module_name} \\\n")
else:
lines.append(line)
with open(android_mk, "w") as f:
f.write("".join(lines))
def bump_libvintf(self):
if not self.current_version:
print("Skip libvintf update...")