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

Commit df0f792a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add global GCOV_PREFIX option."

parents 22a64b3a 0b364732

rootdir/Android.mk

+7 −0
Original line number Original line Diff line number Diff line
@@ -116,6 +116,12 @@ ifneq ($(filter address,$(SANITIZE_TARGET)),) 
  EXPORT_GLOBAL_ASAN_OPTIONS := export ASAN_OPTIONS include=/system/asan.options

  EXPORT_GLOBAL_ASAN_OPTIONS := export ASAN_OPTIONS include=/system/asan.options

  LOCAL_REQUIRED_MODULES := asan.options $(ASAN_OPTIONS_FILES)

  LOCAL_REQUIRED_MODULES := asan.options $(ASAN_OPTIONS_FILES)

endif

endif



EXPORT_GLOBAL_GCOV_OPTIONS :=

ifeq ($(NATIVE_COVERAGE),true)

  EXPORT_GLOBAL_GCOV_OPTIONS := export GCOV_PREFIX /data/misc/gcov

endif



# Put it here instead of in init.rc module definition,

# Put it here instead of in init.rc module definition,

# because init.rc is conditionally included.

# because init.rc is conditionally included.

#

#
@@ -163,6 +169,7 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/init.environ.rc.in $(bcp_dep) 
	$(hide) sed -e 's?%BOOTCLASSPATH%?$(PRODUCT_BOOTCLASSPATH)?g' $< >$@

	$(hide) sed -e 's?%BOOTCLASSPATH%?$(PRODUCT_BOOTCLASSPATH)?g' $< >$@

	$(hide) sed -i -e 's?%SYSTEMSERVERCLASSPATH%?$(PRODUCT_SYSTEM_SERVER_CLASSPATH)?g' $@

	$(hide) sed -i -e 's?%SYSTEMSERVERCLASSPATH%?$(PRODUCT_SYSTEM_SERVER_CLASSPATH)?g' $@

	$(hide) sed -i -e 's?%EXPORT_GLOBAL_ASAN_OPTIONS%?$(EXPORT_GLOBAL_ASAN_OPTIONS)?g' $@

	$(hide) sed -i -e 's?%EXPORT_GLOBAL_ASAN_OPTIONS%?$(EXPORT_GLOBAL_ASAN_OPTIONS)?g' $@

	$(hide) sed -i -e 's?%EXPORT_GLOBAL_GCOV_OPTIONS%?$(EXPORT_GLOBAL_GCOV_OPTIONS)?g' $@





bcp_md5 :=

bcp_md5 :=

bcp_dep :=

bcp_dep :=

rootdir/init.environ.rc.in

+1 −0
Original line number Original line Diff line number Diff line
@@ -10,3 +10,4 @@ on init 
    export BOOTCLASSPATH %BOOTCLASSPATH%

    export BOOTCLASSPATH %BOOTCLASSPATH%

    export SYSTEMSERVERCLASSPATH %SYSTEMSERVERCLASSPATH%

    export SYSTEMSERVERCLASSPATH %SYSTEMSERVERCLASSPATH%

    %EXPORT_GLOBAL_ASAN_OPTIONS%

    %EXPORT_GLOBAL_ASAN_OPTIONS%

    %EXPORT_GLOBAL_GCOV_OPTIONS%

rootdir/init.rc

+1 −0
Original line number Original line Diff line number Diff line
@@ -408,6 +408,7 @@ on post-fs-data 
    mkdir /data/misc/profiles/cur 0771 system system

    mkdir /data/misc/profiles/cur 0771 system system

    mkdir /data/misc/profiles/ref 0771 system system

    mkdir /data/misc/profiles/ref 0771 system system

    mkdir /data/misc/profman 0770 system shell

    mkdir /data/misc/profman 0770 system shell

    mkdir /data/misc/gcov 0770 root root





    # For security reasons, /data/local/tmp should always be empty.

    # For security reasons, /data/local/tmp should always be empty.

    # Do not place files or directories in /data/local/tmp

    # Do not place files or directories in /data/local/tmp