summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Martin Stjernholm <mast@google.com> 2021-06-08 16:44:57 +0100
committer Martin Stjernholm <mast@google.com> 2021-06-08 16:44:57 +0100
commite82d69a7b459b6bbd25fe880ab818e389e4c20a6 (patch)
tree9da272c32ce7f1726a513577ca006b07fa76420b
parentd0020ba4148f08b9a3e0fa0a543ab8a76277ba36 (diff)
Fix small bug where the mainline module list couldn't be overridden.
Test: env MAINLINE_MODULES=com.android.art \ art/build/build-art-module.sh Test: art/build/build-art-module.sh --skip-apex Bug: 172480615 Change-Id: I040aeea5c7409993e5e8abd855e8cf342caee5fe
-rwxr-xr-xbuild/build-art-module.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/build/build-art-module.sh b/build/build-art-module.sh
index bc6f266220..a40959d009 100755
--- a/build/build-art-module.sh
+++ b/build/build-art-module.sh
@@ -20,7 +20,6 @@ for arg; do
shift
done
-MAINLINE_MODULES=()
if [ -z "$skip_apex" ]; then
# Take the list of modules from MAINLINE_MODULES.
if [ -n "${MAINLINE_MODULES}" ]; then
@@ -31,6 +30,8 @@ if [ -z "$skip_apex" ]; then
com.android.art.debug
)
fi
+else
+ MAINLINE_MODULES=()
fi
# Take the list of products to build the modules for from