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

Commit 853959d8 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge branch 'epic326-u-a14' into 'v1-u' 

Port changes from Android T

See merge request !54
parents 4ae8bbc1 8990c6c5

core/Makefile

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

# The SDK



ifneq ($(filter sdk,$(MAKECMDGOALS)),)

ifneq ($(filter sdk sdk_addon,$(MAKECMDGOALS)),)



# The SDK includes host-specific components, so it belongs under HOST_OUT.

sdk_dir := $(HOST_OUT)/sdk/$(TARGET_PRODUCT)

core/app_prebuilt_internal.mk

+1 −0
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ ifeq ($(module_run_appcompat),true) 
	$(call appcompat-header, aapt2)

	$(run-appcompat)

endif  # module_run_appcompat

	$(patch-trichrome)

	$(sign-package)

	# No need for align-package because sign-package takes care of alignment

else  # LOCAL_CERTIFICATE == PRESIGNED

core/config.mk

+2 −0
Original line number Diff line number Diff line
@@ -749,6 +749,8 @@ JETIFIER := prebuilts/sdk/tools/jetifier/jetifier-standalone/bin/jetifier-standa 


EXTRACT_KERNEL := build/make/tools/extract_kernel.py



PATCH_TRICHROME := build/make/tools/chromium_trichrome_patcher.py



# Path to tools.jar

HOST_JDK_TOOLS_JAR := $(ANDROID_JAVA8_HOME)/lib/tools.jar

core/definitions.mk

+5 −0
Original line number Diff line number Diff line
@@ -4024,3 +4024,8 @@ define use_soong_sdk_libraries 
  $(foreach l,$(1),$(if $(filter $(l),$(SOONG_SDK_VARIANT_MODULES)),\

      $(l).sdk,$(l)))

endef



# Patch Trichrome to add cert digest at buildtime

define patch-trichrome

$(hide) $(PATCH_TRICHROME) $@ $(PRIVATE_CERTIFICATE)

endef

core/sysprop.mk

+8 −1
Original line number Diff line number Diff line
@@ -220,8 +220,15 @@ BUILD_THUMBPRINT := 
# Define human readable strings that describe this build

#



# Spoof target build variant because Whatsapp (and maybe others)

# is checking the "debug" pattern in the Build.DISPLAY variable.

SPOOFED_TARGET_BUILD_VARIANT := $(TARGET_BUILD_VARIANT)

ifeq (userdebug,$(TARGET_BUILD_VARIANT))

    SPOOFED_TARGET_BUILD_VARIANT := user

endif



# BUILD_ID: detail info; has the same info as the build fingerprint

BUILD_DESC := $(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT) $(PLATFORM_VERSION) $(BUILD_ID) $(BUILD_NUMBER_FROM_FILE) $(BUILD_VERSION_TAGS)

BUILD_DESC := e_$(TARGET_DEVICE)-$(SPOOFED_TARGET_BUILD_VARIANT) $(PLATFORM_VERSION) $(BUILD_ID) $(BUILD_NUMBER_FROM_FILE) $(BUILD_VERSION_TAGS)



# BUILD_DISPLAY_ID is shown under Settings -> About Phone

ifeq ($(TARGET_BUILD_VARIANT),user)