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

Commit 789597a5 authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE - Merge Android 13 

Bug: 242648940
Merged-In: Id4aaefbc53b4250b7308701493d151f9408f47f1
Change-Id: Ibbf423b395e45fb552c9d0b993378afac28b4a25
parents 2abfe5f3 81994f0b

core/Makefile

+5 −6
Original line number Diff line number Diff line
@@ -6863,8 +6863,6 @@ else 
sdk_atree_files += $(atree_dir)/sdk.atree

endif



include $(BUILD_SYSTEM)/sdk_font.mk



deps := \

	$(OUT_DOCS)/offline-sdk-timestamp \

	$(SDK_METADATA_FILES) \
@@ -6872,8 +6870,7 @@ deps := \ 
	$(ATREE_FILES) \

	$(sdk_atree_files) \

	$(HOST_OUT_EXECUTABLES)/atree \

	$(HOST_OUT_EXECUTABLES)/line_endings \

	$(SDK_FONT_DEPS)

	$(HOST_OUT_EXECUTABLES)/line_endings



INTERNAL_SDK_TARGET := $(sdk_dir)/$(sdk_name).zip

$(INTERNAL_SDK_TARGET): PRIVATE_NAME := $(sdk_name)
@@ -6896,7 +6893,6 @@ $(INTERNAL_SDK_TARGET): $(deps) 
	  fi; \

	done; \

	if [ $$FAIL ]; then exit 1; fi

	$(hide) echo $(notdir $(SDK_FONT_DEPS)) | tr " " "\n"  > $(SDK_FONT_TEMP)/fontsInSdk.txt

	$(hide) ( \

	    ATREE_STRIP="$(HOST_STRIP) -x" \

	    $(HOST_OUT_EXECUTABLES)/atree \
@@ -6912,7 +6908,6 @@ $(INTERNAL_SDK_TARGET): $(deps) 
	        -v "TARGET_ARCH=$(TARGET_ARCH)" \

	        -v "TARGET_CPU_ABI=$(TARGET_CPU_ABI)" \

	        -v "DLL_EXTENSION=$(HOST_SHLIB_SUFFIX)" \

	        -v "FONT_OUT=$(SDK_FONT_TEMP)" \

	        -o $(PRIVATE_DIR) && \

	    HOST_OUT_EXECUTABLES=$(HOST_OUT_EXECUTABLES) HOST_OS=$(HOST_OS) \

	        development/build/tools/sdk_clean.sh $(PRIVATE_DIR) && \
@@ -7001,6 +6996,10 @@ $(call dist-for-goals,haiku-java,$(SOONG_JAVA_FUZZ_PACKAGING_ARCH_MODULES)) 
haiku-rust: $(SOONG_RUST_FUZZ_PACKAGING_ARCH_MODULES) $(ALL_RUST_FUZZ_TARGETS)

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



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

# Extract platform fonts used in Layoutlib

include $(BUILD_SYSTEM)/layoutlib_fonts.mk





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

# OS Licensing

core/android_soong_config_vars.mk

+10 −0
Original line number Diff line number Diff line
@@ -76,7 +76,9 @@ $(call soong_config_set,art_module,source_build,$(ART_MODULE_BUILD_FROM_SOURCE)) 
# are controlled by the MODULE_BUILD_FROM_SOURCE environment variable by

# default.

INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES := \

  bluetooth \

  permission \

  uwb \

  wifi \



$(foreach m, $(INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES),\
@@ -117,3 +119,11 @@ else 
  SYSTEM_OPTIMIZE_JAVA ?= true

endif

$(call add_soong_config_var,ANDROID,SYSTEM_OPTIMIZE_JAVA)



# Check for SupplementalApi module.

ifeq ($(wildcard packages/modules/SupplementalApi),)

$(call add_soong_config_var_value,ANDROID,include_nonpublic_framework_api,false)

else

$(call add_soong_config_var_value,ANDROID,include_nonpublic_framework_api,true)

endif

core/app_prebuilt_internal.mk

+5 −0
Original line number Diff line number Diff line
@@ -128,6 +128,9 @@ else 
    LOCAL_CERTIFICATE := $(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE))$(LOCAL_CERTIFICATE)

  endif



  # NOTE(ruperts): Consider moving the logic below out of a conditional,

  # to avoid the possibility of silently ignoring user settings.



  PACKAGES.$(LOCAL_MODULE).PRIVATE_KEY := $(LOCAL_CERTIFICATE).pk8

  PACKAGES.$(LOCAL_MODULE).CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem

  PACKAGES := $(PACKAGES) $(LOCAL_MODULE)
@@ -142,6 +145,8 @@ else 


  $(built_module): $(LOCAL_CERTIFICATE_LINEAGE)

  $(built_module): PRIVATE_CERTIFICATE_LINEAGE := $(LOCAL_CERTIFICATE_LINEAGE)



  $(built_module): PRIVATE_ROTATION_MIN_SDK_VERSION := $(LOCAL_ROTATION_MIN_SDK_VERSION)

endif



ifneq ($(LOCAL_MODULE_STEM),)

core/config.mk

+1 −1
Original line number Diff line number Diff line
@@ -820,7 +820,7 @@ BUILD_DATETIME_FROM_FILE := $$(cat $(BUILD_DATETIME_FILE)) 
# is made which breaks compatibility with the previous platform sepolicy version,

# not just on every increase in PLATFORM_SDK_VERSION.  The minor version should

# be reset to 0 on every bump of the PLATFORM_SDK_VERSION.

sepolicy_major_vers := 32

sepolicy_major_vers := 33

sepolicy_minor_vers := 0



ifneq ($(sepolicy_major_vers), $(PLATFORM_SDK_VERSION))

core/definitions.mk

+1 −0
Original line number Diff line number Diff line
@@ -2822,6 +2822,7 @@ define sign-package-arg 
$(hide) mv $(1) $(1).unsigned

$(hide) $(JAVA) -Djava.library.path=$$(dirname $(SIGNAPK_JNI_LIBRARY_PATH)) -jar $(SIGNAPK_JAR) \

    $(if $(strip $(PRIVATE_CERTIFICATE_LINEAGE)), --lineage $(PRIVATE_CERTIFICATE_LINEAGE)) \

    $(if $(strip $(PRIVATE_ROTATION_MIN_SDK_VERSION)), --rotation-min-sdk-version $(PRIVATE_ROTATION_MIN_SDK_VERSION)) \

    $(PRIVATE_CERTIFICATE) $(PRIVATE_PRIVATE_KEY) \

    $(PRIVATE_ADDITIONAL_CERTIFICATES) $(1).unsigned $(1).signed

$(hide) mv $(1).signed $(1)