Refactor init.environ.rc to append than replace
Bug: 353429422
Test: boot
Change-Id: Ibd432fa39fc75f8b49ae26fbc6b74f11fb3f771d
diff --git a/rootdir/Android.bp b/rootdir/Android.bp
index bbc5053..1e7b48b 100644
--- a/rootdir/Android.bp
+++ b/rootdir/Android.bp
@@ -167,11 +167,11 @@
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 {
diff --git a/rootdir/init.environ.rc.in b/rootdir/init.environ.rc.in
index 7ba1f46..9249270 100644
--- a/rootdir/init.environ.rc.in
+++ b/rootdir/init.environ.rc.in
@@ -10,8 +10,5 @@
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.