diff options
| author | Jerome Gaillard <jgaillard@google.com> | 2023-10-17 14:08:09 +0100 |
|---|---|---|
| committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2023-11-01 14:50:00 +0000 |
| commit | 66b3d4491f264ca09b1b06983d390d6aad52b329 (patch) | |
| tree | aadb78c63439cbdd5c6e292676193790d88a7869 | |
| parent | 783d88862567d84fbb6622e7df0a2d5041990198 (diff) | |
| download | layoutlib-66b3d4491f264ca09b1b06983d390d6aad52b329.tar.gz | |
Add delegate for VMRuntime.is64Bit
Android only supports 64 bit artifacts now, and it relies on having
VMRuntime.is64Bit to return true for the system properties to be
correctly set up.
Bug: 74062470
Test: layoutlib tests
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:acf80529e1265c527e7251a1f928fab1508c5160)
Merged-In: I0a3cc0a9c8746f62c0ac23937ccbaa8a5e907dee
Change-Id: I0a3cc0a9c8746f62c0ac23937ccbaa8a5e907dee
| -rw-r--r-- | bridge/src/dalvik/system/VMRuntime_Delegate.java | 5 | ||||
| -rw-r--r-- | common/src/com/android/tools/layoutlib/create/NativeConfig.java | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/bridge/src/dalvik/system/VMRuntime_Delegate.java b/bridge/src/dalvik/system/VMRuntime_Delegate.java index 2fe10154b8..23faf55518 100644 --- a/bridge/src/dalvik/system/VMRuntime_Delegate.java +++ b/bridge/src/dalvik/system/VMRuntime_Delegate.java @@ -36,4 +36,9 @@ public class VMRuntime_Delegate { /*package*/ static int getNotifyNativeInterval() { return VMRuntimeCommonHelper.getNotifyNativeInterval(); } + + @LayoutlibDelegate + public static boolean is64Bit(VMRuntime runtime) { + return true; + } } diff --git a/common/src/com/android/tools/layoutlib/create/NativeConfig.java b/common/src/com/android/tools/layoutlib/create/NativeConfig.java index def9aef674..c2e9783dab 100644 --- a/common/src/com/android/tools/layoutlib/create/NativeConfig.java +++ b/common/src/com/android/tools/layoutlib/create/NativeConfig.java @@ -147,6 +147,7 @@ public class NativeConfig { "com.android.internal.util.XmlUtils#convertValueToInt", "com.android.internal.view.menu.MenuBuilder#createNewMenuItem", "dalvik.system.VMRuntime#getNotifyNativeInterval", + "dalvik.system.VMRuntime#is64Bit", "dalvik.system.VMRuntime#newUnpaddedArray", "libcore.io.MemoryMappedFile#bigEndianIterator", "libcore.io.MemoryMappedFile#close", |