Skip vendor grep binaries

Signed-off-by: Anestis Bechtsoudis <anestis@census-labs.com>
anestisb · Dec 28, 2018 · e085541 · e085541
1 parent 94bde98
commit e085541
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/scripts/constants.sh b/scripts/constants.sh
@@ -59,6 +59,7 @@ declare -ra VENDOR_SKIP_FILES=(
   "manifest.xml"
   "bin/toybox_vendor"
   "bin/toolbox"
+  "bin/grep"
 )
 
 # Files to skip from vendor partition when parsing factory images (for naked config only)

diff --git a/scripts/generate-vendor.sh b/scripts/generate-vendor.sh
@@ -487,16 +487,20 @@ gen_standalone_symlinks() {
 
     local dst="${S_SLINKS_DST[$cnt]}"
     local src="${S_SLINKS_SRC[$cnt]}"
+    local linknm=""
 
     # Skip symbolic links the destination of which is under bytecode directories
     if [[ "$dst" == *app/* ]]; then
       continue
     fi
 
-    # Skip toybox & toolbox links since already built from AOSP
+    linknm="$(basename "$link")"
+
+    # Skip toybox, toolbox & grep links since already built from AOSP
     #  - external/toybox/Android.mk#419
     #  - system/core/toolbox/Android.bp#79
-    if [[ "$(basename "$link")" == "toybox_vendor" || "$(basename "$link")" == "toolbox" ]]; then
+    #  - system/core/toolbox/Android.bp
+    if [[ "$linknm" == "toybox_vendor" || "$linknm" == "toolbox" || "$linknm" == "grep" ]]; then
       continue
     fi