commit 357af0ca2cef85f4df8f5f07698a244227e15990
author Martin Stjernholm <mast@google.com> Wed Jun 24 22:35:15 2020 +0100
committer Martin Stjernholm <mast@google.com> Thu Jun 25 13:49:28 2020 +0000
tree 7754b99b41b625b5e1e65de0e49b79a891150106
parent 1cf46a3342d8821fcdb700ada24ac272e85a2a39

TARGET_BUILD_UNBUNDLED no longer disables flattening.

Test: art/build/apex/runtests.sh on master-art
Bug: 159109002
Change-Id: I653e7d096b10133a9c732bd8d12694cb0a1cbb6b

build/apex/runtests.sh

diff --git a/build/apex/runtests.sh b/build/apex/runtests.sh
index 51acd94..7e3f40f 100755
--- a/build/apex/runtests.sh
+++ b/build/apex/runtests.sh
@@ -48,9 +48,6 @@
 # TODO(b/159109002): Clean this up.
 if [ ! -d $ANDROID_BUILD_TOP/frameworks/base ]; then
   export TARGET_BUILD_UNBUNDLED=true
-  # Flattening is not supported in unbundled mode, regardless what
-  # TARGET_FLATTEN_APEX says.
-  flattened_apex_p=false
 fi
 
 have_debugfs_p=false