commit 5c06e9702ab28c0a02c55184a69c24e4a8f17856
author Steve Muckle <smuckle@google.com> Tue Mar 28 01:30:58 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Mar 28 01:30:58 2017 +0000
tree 5c520e1e15911739cb414c522b7bb608f011967e
parent 0b1e95f08b03f7d30e06fb5ee8d108dff3b08e0b
parent f54833b9d9c87b424163403ff066e6192dbab665

Merge "Fix modules.dep breakage with multiple module dependencies" am: 73461abd0c am: 9c0198e6e9
am: f54833b9d9

Change-Id: I23e179b3442365eaa5862fb2a1f08b3d9f600279

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 4af423c..87be27a 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1106,7 +1106,7 @@
     $(hide) mkdir -p $(4)/lib/modules/0.0/$(3)lib/modules
     $(hide) cp $(1) $(4)/lib/modules/0.0/$(3)lib/modules
     $(hide) $(DEPMOD) -b $(4) 0.0
-    $(hide) sed -e 's/\(.*modules.*\):/\/\1:/g' -e 's/: \(.*modules.*\)/: \/\1/g' -i $(4)/lib/modules/0.0/modules.dep
+    $(hide) sed -e 's/\(.*modules.*\):/\/\1:/g' -e 's/ \([^ ]*modules[^ ]*\)/ \/\1/g' -i $(4)/lib/modules/0.0/modules.dep
     $(hide) cp $(4)/lib/modules/0.0/modules.dep $(2)/lib/modules
 endef