commit cb0f4872ed8377ab46956f579e015fed30a80268
author Mohd Faraz <mohd.faraz.abc@gmail.com> Tue Oct 08 16:13:50 2019 +0530
committer Marko Man <darkobas@gmail.com> Tue Nov 05 10:32:33 2019 +0100
tree 6ec9a34cbb1a4e99a8f2ac334d0151e6ad52de61
parent b91adc026910c279bb7d7f7663c9a9670f30f582

extract_utils: Added Suffix uses COMMON_SUFFIX

 * COMMON_JAVA_PACKAGE_SUFFIX for jar

 * COMMON_ANDROID_PACKAGE_SUFFIX for apk

Change-Id: I812405dac12ef7183985c66a6e43b0ea5f85989c
Signed-off-by: Mohd Faraz <mohd.faraz.abc@gmail.com>

build/tools/extract_utils.sh

diff --git a/build/tools/extract_utils.sh b/build/tools/extract_utils.sh
index 594021c..0c3a156 100755
--- a/build/tools/extract_utils.sh
+++ b/build/tools/extract_utils.sh
@@ -513,6 +513,12 @@
         BASENAME=$(basename "$FILE")
         DIRNAME=$(dirname "$FILE")
         EXTENSION=${BASENAME##*.}
+        EXTENSION="."$EXTENSION
+        if [ "$EXTENSION" = ".jar" ]; then
+                EXTENSION="\$(COMMON_JAVA_PACKAGE_SUFFIX)"
+        elif [ "$EXTENSION" = ".apk" ]; then
+                EXTENSION="\$(COMMON_ANDROID_PACKAGE_SUFFIX)"
+        fi
         PKGNAME=${BASENAME%.*}
 
         # Add to final package list
@@ -594,7 +600,7 @@
             printf 'LOCAL_DEX_PREOPT := false\n'
         fi
         if [ ! -z "$EXTENSION" ]; then
-            printf 'LOCAL_MODULE_SUFFIX := .%s\n' "$EXTENSION"
+            printf 'LOCAL_MODULE_SUFFIX := %s\n' "$EXTENSION"
         fi
         if [ "$CLASS" = "SHARED_LIBRARIES" ] || [ "$CLASS" = "EXECUTABLES" ]; then
             if [ "$DIRNAME" != "." ]; then