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

Commit 8b958921 authored by Narayan Kamath's avatar Narayan Kamath Committed by Gerrit Code Review
Browse files

Merge changes from topic 'aosp-merge-24-12' 

* changes:
  Temporary workaround to build bouncycastle / nist-pkits
  Build: Build changes for multi oat/image support.
  Allow modules to override the default NOTICE file.
  Track introduction of libopenjdkjvm.
  Allow for 5200 words in dump-words-to-file
  Update the package whitelist for the boot image.
  Use core-oj alongside core-libart wherever required.
parents f9911ae0 3006881f

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ LOCAL_SANITIZE_RECOVER:= 
LOCAL_DBUS_PROXY_PREFIX:=

LOCAL_INIT_RC:=

LOCAL_MODULE_HOST_OS:=

LOCAL_NOTICE_FILE:=



# arch specific variables

LOCAL_SRC_FILES_$(TARGET_ARCH):=

core/config.mk

+1 −1
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ endif 


# allow overriding default Java libraries on a per-target basis

ifeq ($(TARGET_DEFAULT_JAVA_LIBRARIES),)

  TARGET_DEFAULT_JAVA_LIBRARIES := core-libart core-junit ext framework okhttp

  TARGET_DEFAULT_JAVA_LIBRARIES := core-oj core-libart core-junit ext framework okhttp

endif



# Flags for DEX2OAT

core/definitions.mk

+2 −1
Original line number Diff line number Diff line
@@ -1756,7 +1756,8 @@ define dump-words-to-file 
        @$(call emit-line,$(wordlist 4401,4600,$(1)),$(2))

        @$(call emit-line,$(wordlist 4601,4800,$(1)),$(2))

        @$(call emit-line,$(wordlist 4801,5000,$(1)),$(2))

        @$(if $(wordlist 5001,5002,$(1)),$(error Too many words ($(words $(1)))))

        @$(call emit-line,$(wordlist 5001,5200,$(1)),$(2))

        @$(if $(wordlist 5201,5202,$(1)),$(error Too many words ($(words $(1)))))

endef



# For a list of jar files, unzip them to a specified directory,

core/dex_preopt_libart.mk

+1 −0
Original line number Diff line number Diff line
@@ -97,5 +97,6 @@ $(hide) $(DEX2OAT) \ 
	--instruction-set-features=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) \

	--include-patch-information --runtime-arg -Xnorelocate --no-generate-debug-info \

	--abort-on-hard-verifier-error \

	--no-inline-from=core-oj.jar \

	$(PRIVATE_DEX_PREOPT_FLAGS)

endef

core/dex_preopt_libart_boot.mk

+6 −2
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ endif 


# The rule to install boot.art and boot.oat

$($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_INSTALLED_IMAGE) : $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) | $(ACP)

	$(call copy-file-to-target)

	$(hide) $(ACP) -fp $(patsubst %.art,%.oat,$<) $(patsubst %.art,%.oat,$@)

	$(hide) $(ACP) -fp $(dir $<)/*.art $(dir $@)

	$(hide) $(ACP) -fp $(dir $<)/*.oat $(dir $@)



$($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME): PRIVATE_2ND_ARCH_VAR_PREFIX := $(my_2nd_arch_prefix)

# Use dex2oat debug version for better error reporting
@@ -51,6 +51,9 @@ $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGE 
	@echo "target dex2oat: $@"

	@mkdir -p $(dir $@)

	@mkdir -p $(dir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)LIBART_TARGET_BOOT_OAT_UNSTRIPPED))

	@rm -f $(dir $@)/*.art $(dir $@)/*.oat

	@rm -f $(dir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)LIBART_TARGET_BOOT_OAT_UNSTRIPPED))/*.art

	@rm -f $(dir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)LIBART_TARGET_BOOT_OAT_UNSTRIPPED))/*.oat

	$(hide) $(DEX2OAT) --runtime-arg -Xms$(DEX2OAT_IMAGE_XMS) --runtime-arg -Xmx$(DEX2OAT_IMAGE_XMX) \

		--image-classes=$(PRELOADED_CLASSES) \

		$(addprefix --dex-file=,$(LIBART_TARGET_BOOT_DEX_FILES)) \
@@ -63,4 +66,5 @@ $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGE 
		--instruction-set-variant=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT) \

		--instruction-set-features=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) \

		--android-root=$(PRODUCT_OUT)/system --include-patch-information --runtime-arg -Xnorelocate --no-generate-debug-info \

		--multi-image --no-inline-from=core-oj.jar \

		$(PRODUCT_DEX_PREOPT_BOOT_FLAGS) $(COMPILED_CLASSES_FLAGS)