diff options
| author | Ryan Mitchell <rtmitchell@google.com> | 2020-12-14 20:42:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-12-14 20:42:03 +0000 |
| commit | 314863c132479b108f0ce61a5a753123cd3a15ca (patch) | |
| tree | 8c2c62e7f5964b3ed503f1f2c753d0850ac70dec /tools/aapt2/cmd/Compile_test.cpp | |
| parent | 2991744d472491889d9ba465c8f96c1022af5df0 (diff) | |
| parent | a45506e6f6619f59ce1ae94b20ad377b86966be0 (diff) | |
Merge changes from topic "inc-hard-am"
* changes:
Revert^2 "Cache resolved theme values"
Set resource id correctly when resolve fails
Revert^2 "libandroidfw hardening for IncFs"
idmap2: remove call to obsolete 'idmap2 verify' from valgrind.sh
idmap2: remove the 'scan' command
Diffstat (limited to 'tools/aapt2/cmd/Compile_test.cpp')
| -rw-r--r-- | tools/aapt2/cmd/Compile_test.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/aapt2/cmd/Compile_test.cpp b/tools/aapt2/cmd/Compile_test.cpp index fb786a31360e..ae9f7926cf09 100644 --- a/tools/aapt2/cmd/Compile_test.cpp +++ b/tools/aapt2/cmd/Compile_test.cpp @@ -252,5 +252,4 @@ TEST_F(CompilerTest, DoNotTranslateTest) { AssertTranslations(this, "donottranslate", expected_not_translatable); AssertTranslations(this, "donottranslate_foo", expected_not_translatable); } - } // namespace aapt |