mirror of
https://github.com/Evolution-X/hardware_interfaces
synced 2026-02-01 16:50:18 +00:00
Merge "Remove Android.mk from bump.py" into main am: 0de4aa3c22
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3304745 Change-Id: If51d4633d952f0b08633024db16e93dcf053c1c0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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...")
|
||||
|
||||
Reference in New Issue
Block a user