Merge "sepolicy: don't construct mappings for ignored types" am: 0c687508d6 am: 95f9bb9a87

Change-Id: I0975a933e6198c84c40dee61cbdcbbf08eaedf22

tests/combine_maps.py

@@ -45,6 +45,11 @@ def Combine(top, bottom):
         # Typeattributes in V.v.cil have _V_v suffix, but not in V.v.ignore.cil
         bottom_type = m.group(1) if m else top_ta
 
+        # If type doesn't exist in bottom map, no need to maintain mappings to
+        # that type.
+        if bottom_type not in bottom.rTypeattributesets.keys():
+            continue
+
         for bottom_ta in bottom.rTypeattributesets[bottom_type]:
             bottom.typeattributesets[bottom_ta].update(top_type_set)