aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSorin Basca <sorinbasca@google.com>2023-03-20 18:08:21 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-03-20 18:08:21 +0000
commitd33aac67b01571e1c780abb32016bf689101d8e2 (patch)
tree52a3c48119ab957e16f9bd7aeb911e7a33939545
parent81f2a7d0be4af718eb2df8e082a55effef69a2af (diff)
parent5b2cd760309e5a46d50cebe2406bce5f92de10e7 (diff)
downloadvogar-d33aac67b01571e1c780abb32016bf689101d8e2.tar.gz
Add PermitedSubclasses in vogar am: 5b2cd76030
Original change: https://android-review.googlesource.com/c/platform/external/vogar/+/2489558 Change-Id: I326c3a18f1d6d161e4afc9487b7d9d00803cbe8a 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