AOSP: Add -e2fsprogs to the e2fsprogs chattr and lsattr.

We want to start shipping the toybox chattr and lsattr on the device all
the time, so the build system rightly complains that then we'd have two
modules with the same name.

I went with a suffix rather than a prefix so that tab completion works
for folks still wanting to use the e2fsprogs versions.

Bug: http://b/147769529
Test: builds
Change-Id: Ib904fa6c709d29ce709302c61e452383c02cb9a3
From AOSP commit: 8525a455e7410461560a99a42feb0dbfabab5c8e

diff --git a/misc/Android.bp b/misc/Android.bp
index dea2f9fe4e7ed7c2b00e473260897eb161ab4511..d5be3a1fc3a4efe0800f39197018ae08c1146e3e 100644 (file)
--- a/misc/Android.bp
+++ b/misc/Android.bp
@@ -174,7 +174,7 @@ cc_binary {
 // Build chattr
 
 cc_binary {
-    name: "chattr",
+    name: "chattr-e2fsprogs",
     host_supported: true,
     defaults: ["e2fsprogs-defaults"],
 
@@ -201,7 +201,7 @@ lsattr_libs = [
 ]
 
 cc_binary {
-    name: "lsattr",
+    name: "lsattr-e2fsprogs",
     host_supported: true,
     defaults: ["lsattr-defaults"],