commit 1ba6df36a99d23bc784d169d626640161e277402
author Treehugger Robot <treehugger-gerrit@google.com> Thu Oct 10 08:41:52 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 10 08:41:52 2019 +0000
tree 5b5b4549cb32aa5c8fb08436da4e6e1c4bb84bfb
parent 4eca6c49c8a5ccde801385854c0cfe07064627b6
parent e2c256cadb65a368cd12cfcf5647d80e0b42b8d2

Merge "Fix file_contexts for flattened apexes"

Android.mk

diff --git a/Android.mk b/Android.mk
index b516fa1..5f35f53 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1377,10 +1377,11 @@
   local_fc_files += $(wildcard $(addsuffix /file_contexts_overlayfs, $(PLAT_PRIVATE_POLICY)))
 endif
 ifeq ($(TARGET_FLATTEN_APEX),true)
-  apex_fc_files := $(wildcard $(LOCAL_PATH)/apex/*-file_contexts)
-  $(foreach _input,$(apex_fc_files),\
-    $(eval _output := $(intermediates)/$(notdir $(_input))-flattened)\
-    $(eval _apex_name := $(patsubst %-file_contexts,%,$(notdir $(_input))))\
+  $(foreach _pair,$(APEX_FILE_CONTEXTS_INFOS),\
+    $(eval _apex_name := $(call word-colon,1,$(_pair)))\
+    $(eval _fc_name := $(call word-colon,2,$(_pair)))\
+    $(eval _input := $(LOCAL_PATH)/apex/$(_fc_name)-file_contexts)\
+    $(eval _output := $(intermediates)/$(_apex_name)-flattened)\
     $(eval $(call build_flattened_apex_file_contexts,$(_input),$(_apex_name),$(_output),local_fc_files))\
    )
 endif