Bug fixes for filtering recursively in maps.

Author: Alexhuszagh

docker/android/scripts/build-system.py

@@ -65,7 +65,7 @@ def remove_soong_tests(path, args, *_):
         else:
             map = node.expr
         for key, value, *_ in map.recurse():
-            if value.is_list():
+            if value.value.is_list():
                 value.filter(lambda x: x.str_op(lambda y: 'libgtest' not in y.lower()))
 
     with open(path, 'w') as file:

docker/android/tests/Android.bp

@@ -69,3 +69,12 @@ cc_test_host {
         "-fstrict-aliasing",
     ],
 }
+cc_defaults {
+    name: "custom",
+    shared_libs: ["libcustom"],
+    whole_static_libs: [
+        "libz",
+        "libgtest_main",
+    ],
+    host_ldlibs: ["-lgtest"],
+}

docker/android/tests/test_soong.py

@@ -22,7 +22,7 @@ def test():
 
     parser = soong.Parser()
     result = parser.parse(iter(tokens))
-    assert len(result) == 6
+    assert len(result) == 7
 
     assert result[0].is_assignment()
     assert result[0].to_str() == '''sample_array = [
@@ -55,8 +55,8 @@ def test():
     filtered = copy.deepcopy(ast)
     filtered.filter(lambda x: not (x.is_scope() and x.is_dev()))
     assert type(filtered) is soong.Ast
-    assert len(filtered) == 4
-    assert filtered == ast[:4]
+    assert len(filtered) == 5
+    assert filtered == ast[:4] + [ast[6]]
 
     map = filtered[1].map
     assert 'cflags' in map
@@ -66,6 +66,15 @@ def test():
     map['array'].filter(lambda x: x != '-short')
     assert len(map['array']) == 1
 
+    custom = filtered[4].map
+    assert 'whole_static_libs' in custom
+    custom['whole_static_libs'].filter(lambda x: x.str_op(lambda y: 'gtest' not in y.lower()))
+    assert custom['whole_static_libs'] == ['libz']
+
+    assert 'host_ldlibs' in custom
+    custom['host_ldlibs'].filter(lambda x: x.str_op(lambda y: 'gtest' not in y.lower()))
+    assert custom['host_ldlibs'] == []
+
 
 def test_addition():
     path = os.path.join(TEST_DIR, 'Addition.bp')