commit 55ef6167a2c235bd88c7216238b2001b46795b79
author Ryan Mitchell <rtmitchell@google.com> Fri Nov 13 23:55:20 2020 +0000
committer Ryan Mitchell <rtmitchell@google.com> Fri Nov 13 23:55:20 2020 +0000
tree 5a63ff5e6b8a0ade4ce5aa2c4d663d62a7d993d9
parent 6ca48473e533a8b89abac6294a0bb8130b8c8c89

Revert "libandroidfw hardening for IncFs"

Revert "Move map_ptr to incfs namspace"

Revert submission 12787270

Reason for revert: b/173250495
Reverted Changes:
I5cd1bc8a2:libandroidfw hardening for IncFs
Ice5dbcfb2:Move map_ptr to incfs namspace
I29ccdc8ed:Do not cache bag parent stack until requested
I1e9e9acaa:Cache resolved theme values

Change-Id: Ib90ef68339710086df41e9abe0833a542d03a74f

tools/aapt2/cmd/Compile_test.cpp

diff --git a/tools/aapt2/cmd/Compile_test.cpp b/tools/aapt2/cmd/Compile_test.cpp
index 8cbd998..0aab94d3 100644
--- a/tools/aapt2/cmd/Compile_test.cpp
+++ b/tools/aapt2/cmd/Compile_test.cpp
@@ -314,10 +314,8 @@
   ASSERT_NE(content_values.find(relative_path_values_colors), -1);
   ASSERT_EQ(content_values.find(path_values_colors), -1);
 
-  ASSERT_TRUE(Link({"-o", apk_path,
-                    "--manifest", GetDefaultManifest(),
-                    "--proto-format"},
-                    compiled_files_dir, &diag));
+  Link({"-o", apk_path, "--manifest", GetDefaultManifest(), "--proto-format"},
+      compiled_files_dir,  &diag);
 
   std::unique_ptr<LoadedApk> apk = LoadedApk::LoadApkFromPath(apk_path, &diag);
   ResourceTable* resource_table = apk.get()->GetResourceTable();