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

Commit 898578e1 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Make change and version bump to RP1A.200707.001 

Change-Id: I253bcb4d139e21de1bda5d1f3aaf78d06815ced2
parents 37294c85 e02730e2

core/binary.mk

+6 −2
Original line number Original line Diff line number Diff line
@@ -71,8 +71,12 @@ ifeq (,$(strip $(my_cc))$(strip $(my_cxx))) 
  my_pool := $(GOMA_OR_RBE_POOL)

  my_pool := $(GOMA_OR_RBE_POOL)

endif

endif





ifneq (,$(strip $(foreach dir,$(COVERAGE_PATHS),$(filter $(dir)%,$(LOCAL_PATH)))))

# TODO(b/158212027): Remove `$(COVERAGE_PATHS)` from this condition when all users have been moved

ifeq (,$(strip $(foreach dir,$(COVERAGE_EXCLUDE_PATHS),$(filter $(dir)%,$(LOCAL_PATH)))))

# to `NATIVE_COVERAGE_PATHS`.

ifneq (,$(strip $(foreach dir,$(COVERAGE_PATHS) $(NATIVE_COVERAGE_PATHS),$(filter $(dir)%,$(LOCAL_PATH)))))

# TODO(b/158212027): Remove `$(COVERAGE_EXCLUDE_PATHS)` from this condition when all users have been

# moved to `NATIVE_COVERAGE_EXCLUDE_PATHS`.

ifeq (,$(strip $(foreach dir,$(COVERAGE_EXCLUDE_PATHS) $(NATIVE_COVERAGE_EXCLUDE_PATHS),$(filter $(dir)%,$(LOCAL_PATH)))))

  my_native_coverage := true

  my_native_coverage := true

else

else

  my_native_coverage := false

  my_native_coverage := false

core/build_id.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,4 +18,4 @@ 
# (like "CRB01").  It must be a single word, and is

# (like "CRB01").  It must be a single word, and is

# capitalized by convention.

# capitalized by convention.





BUILD_ID=RP1A.200706.002
 
BUILD_ID=RP1A.200707.001

core/line_coverage.mk

+2 −3
Original line number Original line Diff line number Diff line
@@ -8,8 +8,7 @@ 
# packs them into another zip file called `line_coverage_profiles.zip`.

# packs them into another zip file called `line_coverage_profiles.zip`.

#

#

# To run the make target set the coverage related envvars first:

# To run the make target set the coverage related envvars first:

# 	NATIVE_LINE_COVERAGE=true NATIVE_COVERAGE=true \

# 	NATIVE_COVERAGE=true NATIVE_COVERAGE_PATHS=* make haiku-line-coverage

#	COVERAGE_PATHS=* make haiku-line-coverage

# -----------------------------------------------------------------

# -----------------------------------------------------------------





# TODO(b/148306195): Due this issue some fuzz targets cannot be built with

# TODO(b/148306195): Due this issue some fuzz targets cannot be built with
@@ -68,7 +67,7 @@ critical_components_shared_inputs := $(foreach lib,$(critical_components_shared) 
fuzz_target_inputs := $(foreach fuzz,$(fuzz_targets), \

fuzz_target_inputs := $(foreach fuzz,$(fuzz_targets), \

	$(call intermediates-dir-for,EXECUTABLES,$(fuzz))/$(fuzz))

	$(call intermediates-dir-for,EXECUTABLES,$(fuzz))/$(fuzz))





# When line coverage is enabled (NATIVE_LINE_COVERAGE is set), make creates

# When coverage is enabled (NATIVE_COVERAGE is set), make creates

# a "coverage" directory and stores all profile (*.gcno) files in inside.

# a "coverage" directory and stores all profile (*.gcno) files in inside.

# We need everything that is stored inside this directory.

# We need everything that is stored inside this directory.

$(line_coverage_profiles): $(fuzz_target_inputs)

$(line_coverage_profiles): $(fuzz_target_inputs)

core/soong_config.mk

+10 −4
Original line number Original line Diff line number Diff line
@@ -110,11 +110,17 @@ $(call add_json_bool, DisableScudo, $(filter true,$(PRODUCT 
$(call add_json_bool, ClangTidy,                         $(filter 1 true,$(WITH_TIDY)))

$(call add_json_bool, ClangTidy,                         $(filter 1 true,$(WITH_TIDY)))

$(call add_json_str,  TidyChecks,                        $(WITH_TIDY_CHECKS))

$(call add_json_str,  TidyChecks,                        $(WITH_TIDY_CHECKS))





$(call add_json_bool, NativeLineCoverage,                $(filter true,$(NATIVE_LINE_COVERAGE)))

$(call add_json_list, JavaCoveragePaths,                 $(JAVA_COVERAGE_PATHS))

$(call add_json_bool, Native_coverage,                   $(filter true,$(NATIVE_COVERAGE)))

$(call add_json_list, JavaCoverageExcludePaths,          $(JAVA_COVERAGE_EXCLUDE_PATHS))



$(call add_json_bool, GcovCoverage,                      $(filter true,$(NATIVE_COVERAGE)))

$(call add_json_bool, ClangCoverage,                     $(filter true,$(CLANG_COVERAGE)))

$(call add_json_bool, ClangCoverage,                     $(filter true,$(CLANG_COVERAGE)))

$(call add_json_list, CoveragePaths,                     $(COVERAGE_PATHS))

# TODO(b/158212027): Remove `$(COVERAGE_PATHS)` from this list when all users have been moved to

$(call add_json_list, CoverageExcludePaths,              $(COVERAGE_EXCLUDE_PATHS))

# `NATIVE_COVERAGE_PATHS`.

$(call add_json_list, NativeCoveragePaths,               $(COVERAGE_PATHS) $(NATIVE_COVERAGE_PATHS))

# TODO(b/158212027): Remove `$(COVERAGE_EXCLUDE_PATHS)` from this list when all users have been

# moved to `NATIVE_COVERAGE_EXCLUDE_PATHS`.

$(call add_json_list, NativeCoverageExcludePaths,        $(COVERAGE_EXCLUDE_PATHS) $(NATIVE_COVERAGE_EXCLUDE_PATHS))





$(call add_json_bool, SamplingPGO,                       $(filter true,$(SAMPLING_PGO)))

$(call add_json_bool, SamplingPGO,                       $(filter true,$(SAMPLING_PGO)))