From 470e78ae212e3ffebba851a28152489f2cdfcf41 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 23 Jan 2020 15:44:10 -0800 Subject: [PATCH] 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 --- misc/Android.bp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/misc/Android.bp b/misc/Android.bp index dea2f9f..d5be3a1 100644 --- 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"], -- 1.8.3.1