Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ce6cb9b authored by Inseob Kim's avatar Inseob Kim
Browse files

Refactor init.environ.rc to append than replace 

Bug: 353429422
Test: boot
Change-Id: Ibd432fa39fc75f8b49ae26fbc6b74f11fb3f771d
parent 96265b34

rootdir/Android.bp

+5 −5
Original line number Diff line number Diff line
@@ -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 {

rootdir/init.environ.rc.in

+2 −5
Original line number Diff line number Diff line
@@ -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.