ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Refactor init.environ.rc to append than replace" into main

Browse source
This commit is contained in:
Treehugger Robot 2024-08-02 08:27:03 +00:00 • committed by Gerrit Code Review
commit ac68a8b797
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
rootdir/Android.bp
View file

@ -167,11 +167,11 @@ genrule {
srcs: ["init.environ.rc.in"],
out: ["init.environ.rc"],
cmd: "cp -f $(in) $(out) && " +
"sed -i -e 's?%EXPORT_GLOBAL_ASAN_OPTIONS%?" + EXPORT_GLOBAL_ASAN_OPTIONS + "?g' $(out) && " +
"sed -i -e 's?%EXPORT_GLOBAL_GCOV_OPTIONS%?" + EXPORT_GLOBAL_GCOV_OPTIONS + "?g' $(out) && " +
"sed -i -e 's?%EXPORT_GLOBAL_CLANG_COVERAGE_OPTIONS%?" + EXPORT_GLOBAL_CLANG_COVERAGE_OPTIONS + "?g' $(out) && " +
"sed -i -e 's?%EXPORT_GLOBAL_HWASAN_OPTIONS%?" + EXPORT_GLOBAL_HWASAN_OPTIONS + "?g' $(out) && " +
"sed -i -e 's?%EXPORT_GLOBAL_SCUDO_ALLOCATION_RING_BUFFER_SIZE%?" + EXPORT_GLOBAL_SCUDO_ALLOCATION_RING_BUFFER_SIZE + "?g' $(out)",
"echo ' " + EXPORT_GLOBAL_ASAN_OPTIONS + "' >> $(out) && " +
"echo ' " + EXPORT_GLOBAL_GCOV_OPTIONS + "' >> $(out) && " +
"echo ' " + EXPORT_GLOBAL_CLANG_COVERAGE_OPTIONS + "' >> $(out) && " +
"echo ' " + EXPORT_GLOBAL_HWASAN_OPTIONS + "' >> $(out) && " +
"echo ' " + EXPORT_GLOBAL_SCUDO_ALLOCATION_RING_BUFFER_SIZE + "' >> $(out)",
}
prebuilt_root {

7
rootdir/init.environ.rc.in
View file

@ -10,8 +10,5 @@ on early-init
export ANDROID_TZDATA_ROOT /apex/com.android.tzdata
export EXTERNAL_STORAGE /sdcard
export ASEC_MOUNTPOINT /mnt/asec
%EXPORT_GLOBAL_ASAN_OPTIONS%
%EXPORT_GLOBAL_GCOV_OPTIONS%
%EXPORT_GLOBAL_CLANG_COVERAGE_OPTIONS%
%EXPORT_GLOBAL_HWASAN_OPTIONS%
%EXPORT_GLOBAL_SCUDO_ALLOCATION_RING_BUFFER_SIZE%
# Additional environment variables will be appended here during build (see Android.bp).
# DO NOT ADD additional sections like 'on <event>' here.