Fix: runtime apex is not instrumented with sanitizer
Fixing the problem that IsSanitizerEnabled always returns false due to the different sanitizer names from config.SanitizerDevice() and sanitizerType.String(). Bug: 123708856 Test: SANITIZE_TARGET=hwaddress m com.android.runtime.release $ ls -al out/soong/.intermediates/art/build/apex/com.android.runtime.release/android_common_hwasan_com.android.runtime.release/image.apex/lib | wc -l 34 $ ls -al out/soong/.intermediates/art/build/apex/com.android.runtime.release/android_common_hwasan_com.android.runtime.release/image.apex/lib64 | wc -l 35 $ ls -al out/target/product/blueline/apex/com.android.runtime.release/lib | wc -l 34 $ ls -al out/target/product/blueline/apex/com.android.runtime.release/lib64 | wc -l 35 Test: inspect out/soong/build.ninja - Variant of com.android.runtime.release is "android_common_hwasan_com.android.runtime.release" - Dependencies of com.android.runtime.release are hwasan variants: e.g., out/soong/.intermediates/bionic/libc/libc/android_arm64_armv8-2a_kryo385_core_shared_hwasan_com.android.runtime.release/libc.so Test: ls out/soong/.intermediates/art/build/apex/com.android.runtime.release/android_common_hwasan_com.android.runtime.release/image.apex/lib64/*.so | xargs readelf -d | grep libclang_rt.hwasan | wc -l 29 Change-Id: Idbb1f68a3ea6bdd02351d6f6048c3eedb9cf32d2
Loading
Please register or sign in to comment