summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHashBang <hashbang173@gmail.com>2016-08-01 14:36:46 -0400
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-10-08 14:21:15 -0700
commit8a1906ce9439378ae5f046891e10de3c6734f46c (patch)
tree6a04f2914ae3b76a12970c7ecc687a6da9229ad5
parentfb1f75f43fd69a47fb8f386ac10e75cedb099447 (diff)
downloadvendor_replicant-8a1906ce9439378ae5f046891e10de3c6734f46c.zip
vendor_replicant-8a1906ce9439378ae5f046891e10de3c6734f46c.tar.gz
vendor_replicant-8a1906ce9439378ae5f046891e10de3c6734f46c.tar.bz2
extract_utils: Do not change app SRC if there are arguments
Do not prepend app or priv-app to the src when a path is explicitly given as an argument. This fixes the SRC path in such conditions. Change-Id: I43370f17fe224df323fcfa9b0d5eae4ee2996524
-rw-r--r--build/tools/extract_utils.sh10
1 files changed, 6 insertions, 4 deletions
diff --git a/build/tools/extract_utils.sh b/build/tools/extract_utils.sh
index fb7602b..ce81cd6 100644
--- a/build/tools/extract_utils.sh
+++ b/build/tools/extract_utils.sh
@@ -249,10 +249,12 @@ function write_packages() {
printf 'LOCAL_MULTILIB := %s\n' "$EXTRA"
fi
elif [ "$CLASS" = "APPS" ]; then
- if [ "$EXTRA" = "priv-app" ]; then
- SRC="$SRC/priv-app"
- else
- SRC="$SRC/app"
+ if [ -z "$ARGS" ]; then
+ if [ "$EXTRA" = "priv-app" ]; then
+ SRC="$SRC/priv-app"
+ else
+ SRC="$SRC/app"
+ fi
fi
printf 'LOCAL_SRC_FILES := %s/%s\n' "$SRC" "$FILE"
local CERT=platform