aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSorin Basca <sorinbasca@google.com>2023-03-20 18:46:01 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-03-20 18:46:01 +0000
commitc5ebc92e4e5354464b861e7646418acebb618a43 (patch)
tree52a3c48119ab957e16f9bd7aeb911e7a33939545
parent9b091a0e463e6cc48ff8240b8847ee3210d32f27 (diff)
parentd33aac67b01571e1c780abb32016bf689101d8e2 (diff)
downloadvogar-c5ebc92e4e5354464b861e7646418acebb618a43.tar.gz
Add PermitedSubclasses in vogar am: 5b2cd76030 am: d33aac67b0
Original change: https://android-review.googlesource.com/c/platform/external/vogar/+/2489558 Change-Id: Id381499fec266a4b9f51e194008b8abc0c726c9e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--src/vogar/android/AndroidSdk.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/vogar/android/AndroidSdk.java b/src/vogar/android/AndroidSdk.java
index 4ba8b28..220e6a6 100644
--- a/src/vogar/android/AndroidSdk.java
+++ b/src/vogar/android/AndroidSdk.java
@@ -397,7 +397,8 @@ public class AndroidSdk {
builder.args(D8_COMMAND_NAME);
builder.args("-JXms16M").args("-JXmx1536M");
builder.args("-JXX:+TieredCompilation").args("-JXX:TieredStopAtLevel=1");
- builder.args("-JDcom.android.tools.r8.emitRecordAnnotationsInDex=1");
+ builder.args("-JDcom.android.tools.r8.emitRecordAnnotationsInDex");
+ builder.args("-JDcom.android.tools.r8.emitPermittedSubclassesAnnotationsInDex");
builder.args("--thread-count").args("1");
// d8 will not allow compiling with a single dex file as the target, but if given