diff options
| author | 2024-01-25 01:14:50 +0000 | |
|---|---|---|
| committer | 2024-01-25 01:14:50 +0000 | |
| commit | c01f9663fbb31157ab104dcdd4a590b7e3e74c57 (patch) | |
| tree | 7a48a32d3e1ff1076c0fc690f2aafe756af89bf0 | |
| parent | d219604d0890a65c3dda96b6425897353ef9b4f4 (diff) | |
| parent | f3ebcb03233b0a81cc16917825e23fc779ecbab7 (diff) | |
Merge changes Ia8b00053,I98851ea9 into main am: f3ebcb0323
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2926318
Change-Id: I11d2836c1921fabd2cd453f4842c398351d26ed9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | native/graphics/jni/Android.bp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/native/graphics/jni/Android.bp b/native/graphics/jni/Android.bp index 10c570b30d7a..8ea46329af58 100644 --- a/native/graphics/jni/Android.bp +++ b/native/graphics/jni/Android.bp @@ -72,6 +72,9 @@ cc_library_shared { ], }, }, + stubs: { + symbol_file: "libjnigraphics.map.txt", + }, } // The headers module is in frameworks/native/Android.bp. @@ -93,15 +96,18 @@ cc_defaults { ], static_libs: ["libarect"], fuzz_config: { - cc: ["dichenzhang@google.com","scroggo@google.com"], + cc: [ + "dichenzhang@google.com", + "scroggo@google.com", + ], asan_options: [ "detect_odr_violation=1", ], hwasan_options: [ - // Image decoders may attempt to allocate a large amount of memory - // (especially if the encoded image is large). This doesn't - // necessarily mean there is a bug. Set allocator_may_return_null=1 - // for hwasan so the fuzzer can continue running. + // Image decoders may attempt to allocate a large amount of memory + // (especially if the encoded image is large). This doesn't + // necessarily mean there is a bug. Set allocator_may_return_null=1 + // for hwasan so the fuzzer can continue running. "allocator_may_return_null = 1", ], }, |