summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFedor Kudasov <kudasov@google.com>2020-03-10 09:58:21 +0000
committerFedor Kudasov <kudasov@google.com>2020-03-10 09:58:21 +0000
commitdaf8a2aba8ab7e1442a1bbdc4811934b78216541 (patch)
tree523a3b7830b61a6fd0b93e4f217c83bfd3959bed
parent8afe78b7cdc92a4906de9f2fbcd11d97be152969 (diff)
downloadlayoutlib-daf8a2aba8ab7e1442a1bbdc4811934b78216541.tar.gz
Update layoutlib prebuilt
CHANGELOG ---------------------------------------------------------------------------------------- 10495299 Refactor measureLayout 10511495 Revert "Dispose compose view" 10209480 Dispose compose view 10499174 Ignore callbacks if no session Bug: N/A Test: Updating prebuilt. Existing tests should pass. layoutlib built from qt-layoutlib-native@ca544e075bfa63ccfab088292b1438d29bcdd12f Change-Id: Icb24339d71bc6c46991a2e3cfc1995911ffa1210
-rw-r--r--PREBUILT4
-rw-r--r--data/layoutlib_native.jarbin35023337 -> 35022519 bytes
-rw-r--r--data/mac/lib64/libandroid_runtime.dylibbin13487048 -> 13487048 bytes
-rw-r--r--data/mac/lib64/libc++.dylibbin1365732 -> 1365732 bytes
-rw-r--r--data/mac/lib64/liblog.dylibbin99660 -> 99660 bytes
-rw-r--r--data/win/lib64/libandroid_runtime.dllbin7773184 -> 7773184 bytes
-rw-r--r--data/win/lib64/libicuuc-host.dllbin1798144 -> 1798144 bytes
-rw-r--r--data/win/lib64/libicuuc_stubdata.dllbin14848 -> 14848 bytes
-rw-r--r--data/win/lib64/liblog.dllbin137728 -> 137728 bytes
9 files changed, 2 insertions, 2 deletions
diff --git a/PREBUILT b/PREBUILT
index b4b273e9..70cbc2d8 100644
--- a/PREBUILT
+++ b/PREBUILT
@@ -5,6 +5,6 @@ The script to update the prebuilts can be found in
The object in this prebuilt directory can be rebuilt from
platform/frameworks/base/tools/layoutlib
-From: qt-layoutlib-dev@e0cc6d3735d66d99298af31a705b10b0cf42c16f
- https://android.googlesource.com/platform/frameworks/layoutlib/+/e0cc6d3735d66d99298af31a705b10b0cf42c16f
+From: qt-layoutlib-native@ca544e075bfa63ccfab088292b1438d29bcdd12f
+ https://android.googlesource.com/platform/frameworks/layoutlib/+/ca544e075bfa63ccfab088292b1438d29bcdd12f
diff --git a/data/layoutlib_native.jar b/data/layoutlib_native.jar
index 6a87fe41..507c17e1 100644
--- a/data/layoutlib_native.jar
+++ b/data/layoutlib_native.jar
Binary files differ
diff --git a/data/mac/lib64/libandroid_runtime.dylib b/data/mac/lib64/libandroid_runtime.dylib
index 833a469c..f61d65b1 100644
--- a/data/mac/lib64/libandroid_runtime.dylib
+++ b/data/mac/lib64/libandroid_runtime.dylib
Binary files differ
diff --git a/data/mac/lib64/libc++.dylib b/data/mac/lib64/libc++.dylib
index c50c126f..c220ff80 100644
--- a/data/mac/lib64/libc++.dylib
+++ b/data/mac/lib64/libc++.dylib
Binary files differ
diff --git a/data/mac/lib64/liblog.dylib b/data/mac/lib64/liblog.dylib
index d58b943b..b155b8a5 100644
--- a/data/mac/lib64/liblog.dylib
+++ b/data/mac/lib64/liblog.dylib
Binary files differ
diff --git a/data/win/lib64/libandroid_runtime.dll b/data/win/lib64/libandroid_runtime.dll
index 10559bad..d319d0f6 100644
--- a/data/win/lib64/libandroid_runtime.dll
+++ b/data/win/lib64/libandroid_runtime.dll
Binary files differ
diff --git a/data/win/lib64/libicuuc-host.dll b/data/win/lib64/libicuuc-host.dll
index 94c777b8..5acef1cd 100644
--- a/data/win/lib64/libicuuc-host.dll
+++ b/data/win/lib64/libicuuc-host.dll
Binary files differ
diff --git a/data/win/lib64/libicuuc_stubdata.dll b/data/win/lib64/libicuuc_stubdata.dll
index 82f30917..b1ae54e7 100644
--- a/data/win/lib64/libicuuc_stubdata.dll
+++ b/data/win/lib64/libicuuc_stubdata.dll
Binary files differ
diff --git a/data/win/lib64/liblog.dll b/data/win/lib64/liblog.dll
index bc889e3c..b26b9e03 100644
--- a/data/win/lib64/liblog.dll
+++ b/data/win/lib64/liblog.dll
Binary files differ