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

Commit 6bb5c06a authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Make change and version bump to BP3A.250501.001 

Snap for 13431276 from 3c547dbd to 25Q3-release

Change-Id: Id0c2d3a8471d66b9276110aff68a7464f76c51ef
parents 8ed1c736 3c547dbd

core/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -7961,10 +7961,6 @@ $(call dist-for-goals,haiku,$(PRODUCT_OUT)/module-info.json) 
.PHONY: haiku-java

haiku-java: $(SOONG_JAVA_FUZZ_PACKAGING_ARCH_MODULES) $(ALL_JAVA_FUZZ_TARGETS)

$(call dist-for-goals,haiku-java,$(SOONG_JAVA_FUZZ_PACKAGING_ARCH_MODULES))

.PHONY: haiku-rust

haiku-rust: $(SOONG_RUST_FUZZ_PACKAGING_ARCH_MODULES) $(ALL_RUST_FUZZ_TARGETS)

$(call dist-for-goals,haiku-rust,$(SOONG_RUST_FUZZ_PACKAGING_ARCH_MODULES))

$(call dist-for-goals,haiku-rust,$(PRODUCT_OUT)/module-info.json)

.PHONY: haiku-presubmit

haiku-presubmit: $(SOONG_PRESUBMIT_FUZZ_PACKAGING_ARCH_MODULES) $(ALL_PRESUBMIT_FUZZ_TARGETS)

$(call dist-for-goals,haiku-presubmit,$(SOONG_PRESUBMIT_FUZZ_PACKAGING_ARCH_MODULES))

core/binary.mk

+7 −16
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 


#######################################

include $(BUILD_SYSTEM)/base_rules.mk

include $(BUILD_SYSTEM)/use_lld_setup.mk

#######################################



##################################################
@@ -1629,17 +1628,13 @@ ifndef LOCAL_IS_HOST_MODULE 
my_target_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_CFLAGS)

my_target_global_conlyflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_CONLYFLAGS) $(my_c_std_conlyflags)

my_target_global_cppflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_CPPFLAGS) $(my_cpp_std_cppflags)

ifeq ($(my_use_clang_lld),true)

  my_target_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_LLDFLAGS)

my_target_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_LDFLAGS)

include $(BUILD_SYSTEM)/pack_dyn_relocs_setup.mk

ifeq ($(my_pack_module_relocations),true)

  my_target_global_ldflags += -Wl,--pack-dyn-relocs=android+relr -Wl,--use-android-relr-tags

else

  my_target_global_ldflags += -Wl,--pack-dyn-relocs=none

endif

else

  my_target_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_LDFLAGS)

endif # my_use_clang_lld



ifeq ($(call module-in-vendor-or-product),true)

  my_target_global_c_includes :=
@@ -1684,11 +1679,7 @@ my_host_global_c_system_includes := $(SRC_SYSTEM_HEADERS) \ 
my_host_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_CFLAGS)

my_host_global_conlyflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_CONLYFLAGS) $(my_c_std_conlyflags)

my_host_global_cppflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_CPPFLAGS) $(my_cpp_std_cppflags)

ifeq ($(my_use_clang_lld),true)

  my_host_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_LLDFLAGS)

else

my_host_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_LDFLAGS)

endif # my_use_clang_lld



$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_GLOBAL_C_INCLUDES := $(my_host_global_c_includes)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_GLOBAL_C_SYSTEM_INCLUDES := $(my_host_global_c_system_includes)

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=BP3A.250430.002
 
BUILD_ID=BP3A.250501.001

core/clear_vars.mk

+0 −1
Original line number Diff line number Diff line
@@ -308,7 +308,6 @@ LOCAL_UNCOMPRESS_DEX:= 
LOCAL_UNINSTALLABLE_MODULE:=

LOCAL_UNSTRIPPED_PATH:=

LOCAL_USE_AAPT2:=

LOCAL_USE_CLANG_LLD:=

LOCAL_USE_VNDK:=

LOCAL_IN_VENDOR:=

LOCAL_IN_PRODUCT:=

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -1433,7 +1433,7 @@ $(hide) $(PRIVATE_CXX_LINK) -fuse-ld=lld -target $(CLANG_TARGET_TRIPLE) -shared 
  -Wl,-rpath,\$$ORIGIN/../lib \

  $(dir $@)/$(notdir $(<:.bc=.o)) \

  $(RS_PREBUILT_COMPILER_RT) \

  -o $@ $(CLANG_TARGET_GLOBAL_LLDFLAGS) -Wl,--hash-style=sysv \

  -o $@ $(CLANG_TARGET_GLOBAL_LDFLAGS) -Wl,--hash-style=sysv \

  -L $(SOONG_OUT_DIR)/ndk/platforms/android-$(PRIVATE_SDK_VERSION)/arch-$(TARGET_ARCH)/usr/lib64 \

  -L $(SOONG_OUT_DIR)/ndk/platforms/android-$(PRIVATE_SDK_VERSION)/arch-$(TARGET_ARCH)/usr/lib \

  $(call intermediates-dir-for,SHARED_LIBRARIES,libRSSupport)/libRSSupport.so \