Snap for 7744445 from c30bd0bfbeeb1881772df6ad0ea8c40507a57d2b to sc-qpr1-release
Change-Id: I80eced78946d6ab596054be80aec2c12327cc6aa
diff --git a/.prebuilt_info/prebuilt_info_current_host-exports_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_host-exports_current_zip.asciipb
index 78f2549..b3de012 100644
--- a/.prebuilt_info/prebuilt_info_current_host-exports_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_host-exports_current_zip.asciipb
@@ -1,6 +1,6 @@
drops {
android_build_drop {
- build_id: "7653768"
+ build_id: "7734983"
target: "mainline_modules-user"
source_file: "mainline-sdks/art-module-host-exports-current.zip"
}
diff --git a/.prebuilt_info/prebuilt_info_current_sdk_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_sdk_current_zip.asciipb
index eb54472..74ff65c 100644
--- a/.prebuilt_info/prebuilt_info_current_sdk_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_sdk_current_zip.asciipb
@@ -1,6 +1,6 @@
drops {
android_build_drop {
- build_id: "7653768"
+ build_id: "7734983"
target: "mainline_modules-user"
source_file: "mainline-sdks/art-module-sdk-current.zip"
}
diff --git a/.prebuilt_info/prebuilt_info_current_test-exports_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_test-exports_current_zip.asciipb
index 36a38fb..7d6c512 100644
--- a/.prebuilt_info/prebuilt_info_current_test-exports_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_test-exports_current_zip.asciipb
@@ -1,6 +1,6 @@
drops {
android_build_drop {
- build_id: "7653768"
+ build_id: "7734983"
target: "mainline_modules-user"
source_file: "mainline-sdks/art-module-test-exports-current.zip"
}
diff --git a/current/host-exports/include/art/libartbase/base/memfd.h b/current/host-exports/include/art/libartbase/base/memfd.h
index 0bb336d..3c27dcb 100644
--- a/current/host-exports/include/art/libartbase/base/memfd.h
+++ b/current/host-exports/include/art/libartbase/base/memfd.h
@@ -53,6 +53,10 @@
# define F_SEAL_FUTURE_WRITE 0x0010
#endif
+#ifndef MFD_CLOEXEC
+# define MFD_CLOEXEC 0x0001U
+#endif
+
#ifndef MFD_ALLOW_SEALING
# define MFD_ALLOW_SEALING 0x0002U
#endif
diff --git a/current/host-exports/include/art/libartpalette/include/palette/palette_method_list.h b/current/host-exports/include/art/libartpalette/include/palette/palette_method_list.h
index 6a7822b..066f24f 100644
--- a/current/host-exports/include/art/libartpalette/include/palette/palette_method_list.h
+++ b/current/host-exports/include/art/libartpalette/include/palette/palette_method_list.h
@@ -53,5 +53,15 @@
M(PaletteShouldReportJniInvocations, bool*) \
M(PaletteNotifyBeginJniInvocation, JNIEnv* env) \
M(PaletteNotifyEndJniInvocation, JNIEnv* env) \
+ M(PaletteReportLockContention, JNIEnv* env, \
+ int32_t wait_ms, \
+ const char* filename, \
+ int32_t line_number, \
+ const char* method_name, \
+ const char* owner_filename, \
+ int32_t owner_line_number, \
+ const char* owner_method_name, \
+ const char* proc_name, \
+ const char* thread_name) \
#endif // ART_LIBARTPALETTE_INCLUDE_PALETTE_PALETTE_METHOD_LIST_H_
diff --git a/current/host-exports/x86_64/bin/dex2oat64 b/current/host-exports/x86_64/bin/dex2oat64
index 56992bb..ebbcaf4 100755
--- a/current/host-exports/x86_64/bin/dex2oat64
+++ b/current/host-exports/x86_64/bin/dex2oat64
Binary files differ
diff --git a/current/host-exports/x86_64/bin/dex2oatd64 b/current/host-exports/x86_64/bin/dex2oatd64
index a6b0182..f8018e6 100755
--- a/current/host-exports/x86_64/bin/dex2oatd64
+++ b/current/host-exports/x86_64/bin/dex2oatd64
Binary files differ
diff --git a/current/host-exports/x86_64/bin/dexdump b/current/host-exports/x86_64/bin/dexdump
index 746e91e..6aa6cdb 100755
--- a/current/host-exports/x86_64/bin/dexdump
+++ b/current/host-exports/x86_64/bin/dexdump
Binary files differ
diff --git a/current/host-exports/x86_64/bin/hiddenapi b/current/host-exports/x86_64/bin/hiddenapi
index 635cb83..2480597 100755
--- a/current/host-exports/x86_64/bin/hiddenapi
+++ b/current/host-exports/x86_64/bin/hiddenapi
Binary files differ
diff --git a/current/host-exports/x86_64/bin/oatdump b/current/host-exports/x86_64/bin/oatdump
index f2d4b5a..720aab6 100755
--- a/current/host-exports/x86_64/bin/oatdump
+++ b/current/host-exports/x86_64/bin/oatdump
Binary files differ
diff --git a/current/host-exports/x86_64/bin/profman b/current/host-exports/x86_64/bin/profman
index 60f9dfe..6562f54 100755
--- a/current/host-exports/x86_64/bin/profman
+++ b/current/host-exports/x86_64/bin/profman
Binary files differ
diff --git a/current/host-exports/x86_64/bin/veridex b/current/host-exports/x86_64/bin/veridex
index 21e2e7c..cf0ffd4 100755
--- a/current/host-exports/x86_64/bin/veridex
+++ b/current/host-exports/x86_64/bin/veridex
Binary files differ
diff --git a/current/host-exports/x86_64/lib/libartpalette.a b/current/host-exports/x86_64/lib/libartpalette.a
index e74ba05..9c49810 100644
--- a/current/host-exports/x86_64/lib/libartpalette.a
+++ b/current/host-exports/x86_64/lib/libartpalette.a
Binary files differ
diff --git a/current/host-exports/x86_64/lib/libartpalette.so b/current/host-exports/x86_64/lib/libartpalette.so
index 93e7788..131bc95 100755
--- a/current/host-exports/x86_64/lib/libartpalette.so
+++ b/current/host-exports/x86_64/lib/libartpalette.so
Binary files differ
diff --git a/current/sdk/android/arm/lib/libdexfile_static.a b/current/sdk/android/arm/lib/libdexfile_static.a
index 4c167ff..3d81b58 100644
--- a/current/sdk/android/arm/lib/libdexfile_static.a
+++ b/current/sdk/android/arm/lib/libdexfile_static.a
Binary files differ
diff --git a/current/sdk/android/arm64/lib/libdexfile_static.a b/current/sdk/android/arm64/lib/libdexfile_static.a
index 98e6ee7..6144ed7 100644
--- a/current/sdk/android/arm64/lib/libdexfile_static.a
+++ b/current/sdk/android/arm64/lib/libdexfile_static.a
Binary files differ
diff --git a/current/sdk/android/x86/lib/libdexfile_static.a b/current/sdk/android/x86/lib/libdexfile_static.a
index f937e8c..19dbc39 100644
--- a/current/sdk/android/x86/lib/libdexfile_static.a
+++ b/current/sdk/android/x86/lib/libdexfile_static.a
Binary files differ
diff --git a/current/sdk/android/x86_64/lib/libdexfile_static.a b/current/sdk/android/x86_64/lib/libdexfile_static.a
index fc1c70d..96f9ac1 100644
--- a/current/sdk/android/x86_64/lib/libdexfile_static.a
+++ b/current/sdk/android/x86_64/lib/libdexfile_static.a
Binary files differ
diff --git a/current/sdk/common_os/include/art/libartbase/base/memfd.h b/current/sdk/common_os/include/art/libartbase/base/memfd.h
index 0bb336d..3c27dcb 100644
--- a/current/sdk/common_os/include/art/libartbase/base/memfd.h
+++ b/current/sdk/common_os/include/art/libartbase/base/memfd.h
@@ -53,6 +53,10 @@
# define F_SEAL_FUTURE_WRITE 0x0010
#endif
+#ifndef MFD_CLOEXEC
+# define MFD_CLOEXEC 0x0001U
+#endif
+
#ifndef MFD_ALLOW_SEALING
# define MFD_ALLOW_SEALING 0x0002U
#endif
diff --git a/current/sdk/common_os/include/art/libartpalette/include/palette/palette_method_list.h b/current/sdk/common_os/include/art/libartpalette/include/palette/palette_method_list.h
index 6a7822b..066f24f 100644
--- a/current/sdk/common_os/include/art/libartpalette/include/palette/palette_method_list.h
+++ b/current/sdk/common_os/include/art/libartpalette/include/palette/palette_method_list.h
@@ -53,5 +53,15 @@
M(PaletteShouldReportJniInvocations, bool*) \
M(PaletteNotifyBeginJniInvocation, JNIEnv* env) \
M(PaletteNotifyEndJniInvocation, JNIEnv* env) \
+ M(PaletteReportLockContention, JNIEnv* env, \
+ int32_t wait_ms, \
+ const char* filename, \
+ int32_t line_number, \
+ const char* method_name, \
+ const char* owner_filename, \
+ int32_t owner_line_number, \
+ const char* owner_method_name, \
+ const char* proc_name, \
+ const char* thread_name) \
#endif // ART_LIBARTPALETTE_INCLUDE_PALETTE_PALETTE_METHOD_LIST_H_
diff --git a/current/sdk/common_os/include/art/libdexfile/dex/dex_file.h b/current/sdk/common_os/include/art/libdexfile/dex/dex_file.h
index 5363b00..e3027fc 100644
--- a/current/sdk/common_os/include/art/libdexfile/dex/dex_file.h
+++ b/current/sdk/common_os/include/art/libdexfile/dex/dex_file.h
@@ -738,7 +738,7 @@
}
// Used by oat writer.
- void SetOatDexFile(OatDexFile* oat_dex_file) const {
+ void SetOatDexFile(const OatDexFile* oat_dex_file) const {
oat_dex_file_ = oat_dex_file;
}
diff --git a/current/sdk/linux_glibc/x86/lib/libdexfile.so b/current/sdk/linux_glibc/x86/lib/libdexfile.so
index 80d15e4..67fc0b2 100755
--- a/current/sdk/linux_glibc/x86/lib/libdexfile.so
+++ b/current/sdk/linux_glibc/x86/lib/libdexfile.so
Binary files differ
diff --git a/current/sdk/linux_glibc/x86/lib/libdexfile_static.a b/current/sdk/linux_glibc/x86/lib/libdexfile_static.a
index 4e9d2ab..3456d11 100644
--- a/current/sdk/linux_glibc/x86/lib/libdexfile_static.a
+++ b/current/sdk/linux_glibc/x86/lib/libdexfile_static.a
Binary files differ
diff --git a/current/sdk/linux_glibc/x86/lib/libsigchain.so b/current/sdk/linux_glibc/x86/lib/libsigchain.so
index 7bc7329..464f4f2 100755
--- a/current/sdk/linux_glibc/x86/lib/libsigchain.so
+++ b/current/sdk/linux_glibc/x86/lib/libsigchain.so
Binary files differ
diff --git a/current/sdk/linux_glibc/x86_64/lib/libdexfile.so b/current/sdk/linux_glibc/x86_64/lib/libdexfile.so
index 9bc989f..b73222f 100755
--- a/current/sdk/linux_glibc/x86_64/lib/libdexfile.so
+++ b/current/sdk/linux_glibc/x86_64/lib/libdexfile.so
Binary files differ
diff --git a/current/sdk/linux_glibc/x86_64/lib/libdexfile_static.a b/current/sdk/linux_glibc/x86_64/lib/libdexfile_static.a
index ec4456b..45620ba 100644
--- a/current/sdk/linux_glibc/x86_64/lib/libdexfile_static.a
+++ b/current/sdk/linux_glibc/x86_64/lib/libdexfile_static.a
Binary files differ
diff --git a/current/sdk/linux_glibc/x86_64/lib/libsigchain.so b/current/sdk/linux_glibc/x86_64/lib/libsigchain.so
index 8f5aca9..c4692c6 100755
--- a/current/sdk/linux_glibc/x86_64/lib/libsigchain.so
+++ b/current/sdk/linux_glibc/x86_64/lib/libsigchain.so
Binary files differ
diff --git a/current/test-exports/arm/lib/libjavacoretests.so b/current/test-exports/arm/lib/libjavacoretests.so
index 5669609..b94680b 100755
--- a/current/test-exports/arm/lib/libjavacoretests.so
+++ b/current/test-exports/arm/lib/libjavacoretests.so
Binary files differ
diff --git a/current/test-exports/arm64/lib/libjavacoretests.so b/current/test-exports/arm64/lib/libjavacoretests.so
index b113552..ca4eeb4 100755
--- a/current/test-exports/arm64/lib/libjavacoretests.so
+++ b/current/test-exports/arm64/lib/libjavacoretests.so
Binary files differ
diff --git a/current/test-exports/x86/lib/libjavacoretests.so b/current/test-exports/x86/lib/libjavacoretests.so
index 651ba67..69b429f 100755
--- a/current/test-exports/x86/lib/libjavacoretests.so
+++ b/current/test-exports/x86/lib/libjavacoretests.so
Binary files differ
diff --git a/current/test-exports/x86_64/lib/libjavacoretests.so b/current/test-exports/x86_64/lib/libjavacoretests.so
index e0ff717..4cc3e86 100755
--- a/current/test-exports/x86_64/lib/libjavacoretests.so
+++ b/current/test-exports/x86_64/lib/libjavacoretests.so
Binary files differ
