diff options
| author | Sorin Basca <sorinbasca@google.com> | 2023-03-21 01:16:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-21 01:16:25 +0000 |
| commit | 915150e3fed81eaa07b15922b4277a4089635c29 (patch) | |
| tree | 52a3c48119ab957e16f9bd7aeb911e7a33939545 | |
| parent | 95a94a703d581b3e294da82d1edbfbdf745f7c6e (diff) | |
| parent | c5ebc92e4e5354464b861e7646418acebb618a43 (diff) | |
| download | vogar-915150e3fed81eaa07b15922b4277a4089635c29.tar.gz | |
Add PermitedSubclasses in vogar am: 5b2cd76030 am: d33aac67b0 am: c5ebc92e4e
Original change: https://android-review.googlesource.com/c/platform/external/vogar/+/2489558
Change-Id: Idb62ff0c0d566f641230adf4bc495c73e3beb960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | src/vogar/android/AndroidSdk.java | 3 |
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 |