Skip to content

Commit bbd1ca3

Browse files
authored
Rollup merge of #70054 - rojamd:android-pgo, r=michaelwoerister
Build dist-android with --enable-profiler This will make the runtime available to enable PGO for Rust code in Firefox on Android. r? @michaelwoerister
2 parents 0b99489 + 50c0562 commit bbd1ca3

File tree

2 files changed

+1
-1
lines changed

2 files changed

+1
-1
lines changed

src/ci/docker/dist-android/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ ENV TARGETS=$TARGETS,x86_64-linux-android
2323

2424
ENV RUST_CONFIGURE_ARGS \
2525
--enable-extended \
26+
--enable-profiler \
2627
--arm-linux-androideabi-ndk=/android/ndk/arm-14 \
2728
--armv7-linux-androideabi-ndk=/android/ndk/arm-14 \
2829
--thumbv7neon-linux-androideabi-ndk=/android/ndk/arm-14 \

src/libprofiler_builtins/build.rs

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ fn main() {
4141
cfg.flag("-fno-builtin");
4242
cfg.flag("-fvisibility=hidden");
4343
cfg.flag("-fomit-frame-pointer");
44-
cfg.flag("-ffreestanding");
4544
cfg.define("VISIBILITY_HIDDEN", None);
4645
if !target.contains("windows") {
4746
cfg.define("COMPILER_RT_HAS_UNAME", Some("1"));

0 commit comments

Comments
 (0)