commit 181cbfde801b55adfc1b20f510dff02e5a9dcef1
author Jean-Luc Coelho <jeanlucncoelho@google.com> Wed Nov 27 12:37:48 2019 -0800
committer Jean-Luc Coelho <jeanlucncoelho@google.com> Mon Dec 02 21:11:08 2019 +0000
tree 6475bef87cda26f7a3e85dfa0205f909e2be7209
parent f46a4a1c4893ac6ac8a38325e2f0e40462bee441

Add "no-proguard-location-reference" flag to aapt2

This fixes relocatability issues with the code shrinkers.

Bug: 144529940
Test: None
Change-Id: I65e08e850193e67dcdf4c533d9e66332714f0c8c

tools/aapt2/cmd/Link.cpp

diff --git a/tools/aapt2/cmd/Link.cpp b/tools/aapt2/cmd/Link.cpp
index 99a686b..4555caa 100644
--- a/tools/aapt2/cmd/Link.cpp
+++ b/tools/aapt2/cmd/Link.cpp
@@ -1297,7 +1297,8 @@
       return false;
     }
 
-    proguard::WriteKeepSet(keep_set, &fout, options_.generate_minimal_proguard_rules);
+    proguard::WriteKeepSet(keep_set, &fout, options_.generate_minimal_proguard_rules,
+                           options_.no_proguard_location_reference);
     fout.Flush();
 
     if (fout.HadError()) {