commit 316f4a499c4e0e014f59e1207090f84303c5bf7d
author Daniel Mentz <danielmentz@google.com> Thu Mar 28 18:32:29 2019 -0700
committer Daniel Mentz <danielmentz@google.com> Fri Mar 29 21:41:15 2019 +0000
tree a7f1366d72662a525684839cfddc67694737f09f
parent 3e742cb6133ad37ce28e8f0bffdf70f763ed45a3

clean_header: Write to correct dst_file

Write to correct dst_file when in update mode. This enables use cases
like the following:

../../../bionic/libc/kernel/tools/clean_header.py -k original-kernel-headers/ -d kernel-headers/ -u linux/ion.h

Previously, we had to cd into kernel-headers/ and then run

../../../../bionic/libc/kernel/tools/clean_header.py -k ../original-kernel-headers/ -d . -u linux/ion.h

because the tool didn't allow the relative path to be different from the
destination path.

Change-Id: I8c5e284ce7a6737d77a2f5ead3e7e5db01317425

libc/kernel/tools/clean_header.py

diff --git a/libc/kernel/tools/clean_header.py b/libc/kernel/tools/clean_header.py
index 7c802c2..072ca1a 100755
--- a/libc/kernel/tools/clean_header.py
+++ b/libc/kernel/tools/clean_header.py
@@ -187,8 +187,8 @@
         if not new_data:
             continue
 
-        b.readFile(path)
-        r = b.editFile(path, new_data)
+        b.readFile(dst_file)
+        r = b.editFile(dst_file, new_data)
         if r == 0:
             r = "unchanged"
         elif r == 1: