commit 74684035badb80429274f9ad2c7b2106f6a299a2
author Jeremy Meyer <jakmcbane@google.com> Tue Aug 20 14:10:59 2024 -0700
committer Jeremy Meyer <jakmcbane@google.com> Wed Aug 21 15:20:01 2024 -0700
tree bfc54f93c10c987f655aec330dfdd693b1bd3456
parent 56220168523d76ae50b3e9cc98bb9a77b17aaa6e

resource flagging on xml elements

This removes xml elements that are behind disabled flags

Test: Automated
Bug: 329436914
Flag: EXEMPT Aconfig not supported on host tools
Change-Id: Ie8ede5796f9fd0cbaa7f6aa337ddbba1a5588dca

tools/aapt2/link/FlaggedResources_test.cpp

diff --git a/tools/aapt2/link/FlaggedResources_test.cpp b/tools/aapt2/link/FlaggedResources_test.cpp
index c901b58..3db37c2 100644
--- a/tools/aapt2/link/FlaggedResources_test.cpp
+++ b/tools/aapt2/link/FlaggedResources_test.cpp
@@ -84,7 +84,7 @@
   std::string output;
   DumpChunksToString(loaded_apk.get(), &output);
 
-  ASSERT_EQ(output.find("res4"), std::string::npos);
+  ASSERT_EQ(output.find("bool4"), std::string::npos);
   ASSERT_EQ(output.find("str1"), std::string::npos);
 }
 
@@ -94,7 +94,7 @@
   std::string r_contents;
   ::android::base::ReadFileToString(r_path, &r_contents);
 
-  ASSERT_NE(r_contents.find("public static final int res4"), std::string::npos);
+  ASSERT_NE(r_contents.find("public static final int bool4"), std::string::npos);
   ASSERT_NE(r_contents.find("public static final int str1"), std::string::npos);
 }