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

Commit 09f66609 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Make change and version bump to AP4A.240921.001 

Snap for 12397640 from 1bb460b0 to 24Q4-release

Change-Id: I0a3ab22ac092370b2176667e002a23dd269f40cb
parents 438d1f3e 1bb460b0

core/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -1964,7 +1964,7 @@ target_system_dlkm_notice_file_xml_gz := $(TARGET_OUT_INTERMEDIATES)/NOTICE_SYST 
installed_system_dlkm_notice_xml_gz := $(TARGET_OUT_SYSTEM_DLKM)/etc/NOTICE.xml.gz



ALL_INSTALLED_NOTICE_FILES := \

  $(installed_notice_html_or_xml_gz) \

  $(if $(USE_SOONG_DEFINED_SYSTEM_IMAGE),,$(installed_notice_html_or_xml_gz)) \

  $(installed_vendor_notice_xml_gz) \

  $(installed_product_notice_xml_gz) \

  $(installed_system_ext_notice_xml_gz) \
@@ -2051,7 +2051,9 @@ endif 


endif # PRODUCT_NOTICE_SPLIT



ifneq ($(USE_SOONG_DEFINED_SYSTEM_IMAGE),true)

ALL_DEFAULT_INSTALLED_MODULES += $(installed_notice_html_or_xml_gz)

endif



need_vendor_notice:=false

ifeq ($(BUILDING_VENDOR_BOOT_IMAGE),true)

core/build_id.mk

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

# capitalized by convention.



BUILD_ID=AP4A.240920.002
 
BUILD_ID=AP4A.240921.001

core/combo/arch/arm64/armv9-2a.mk

0 → 100644
+18 −0
Original line number Diff line number Diff line 
#

# Copyright (C) 2023 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#



# .mk file required to support build for the ARMv9.2-A arch variant.

# The file just needs to be present, it does not need to contain anything.

core/config_sanitizers.mk

+3 −3
Original line number Diff line number Diff line
@@ -284,9 +284,9 @@ endif 
ifneq ($(filter memtag_stack,$(my_sanitize)),)

  my_cflags += -fsanitize=memtag-stack

  my_ldflags += -fsanitize=memtag-stack

  my_cflags += -march=armv8a+memtag

  my_ldflags += -march=armv8a+memtag

  my_asflags += -march=armv8a+memtag

  my_cflags += -Xclang -target-feature -Xclang +mte

  my_ldflags += -Xclang -target-feature -Xclang +mte

  my_asflags += -Xclang -target-feature -Xclang +mte

  my_sanitize := $(filter-out memtag_stack,$(my_sanitize))

endif

core/main.mk

+2 −2
Original line number Diff line number Diff line
@@ -687,12 +687,12 @@ endef 
# Scan all modules in general-tests, device-tests and other selected suites and

# flatten the shared library dependencies.

define update-host-shared-libs-deps-for-suites

$(foreach suite,general-tests device-tests vts tvts art-host-tests host-unit-tests,\

$(foreach suite,general-tests device-tests vts tvts art-host-tests host-unit-tests camera-hal-tests,\

  $(foreach m,$(COMPATIBILITY.$(suite).MODULES),\

    $(eval my_deps := $(call get-all-shared-libs-deps,$(m)))\

    $(foreach dep,$(my_deps),\

      $(foreach f,$(ALL_MODULES.$(dep).HOST_SHARED_LIBRARY_FILES),\

        $(if $(filter $(suite),device-tests general-tests art-host-tests host-unit-tests),\

        $(if $(filter $(suite),device-tests general-tests art-host-tests host-unit-tests camera-hal-tests),\

          $(eval my_testcases := $(HOST_OUT_TESTCASES)),\

          $(eval my_testcases := $$(COMPATIBILITY_TESTCASES_OUT_$(suite))))\

        $(eval target := $(my_testcases)/$(lastword $(subst /, ,$(dir $(f))))/$(notdir $(f)))\