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

Commit 123f82cb authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

merge from donut

parents 7227ea76 7ebafd5a

cleanspec.mk

+3 −1
Original line number Diff line number Diff line
@@ -83,7 +83,9 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew 
$(call add-clean-step, rm -rf $(OUT_DIR)/product/*/obj/SHARED_LIBRARIES/lib?camera_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/product/*/obj/STATIC_LIBRARIES/lib?camera_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/obj/SHARED_LIBRARIES/libwebcore_intermediates)



$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/ringtones/Silence.ogg)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/ringtones/notifications/Silence.ogg)

# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

core/Makefile

+23 −2
Original line number Diff line number Diff line
@@ -641,10 +641,28 @@ else 
  SYSTEMIMAGE_SOURCE_DIR := $(TARGET_OUT)

endif



$(INSTALLED_SYSTEMIMAGE): $(BUILT_SYSTEMIMAGE) $(INSTALLED_RECOVERYIMAGE_TARGET) | $(ACP)

# The system partition needs room for the recovery image as well.  We

# now store the recovery image as a binary patch using the boot image

# as the source (since they are very similar).  Generate the patch so

# we can see how big it's going to be, and include that in the system

# image size check calculation.

ifneq ($(INSTALLED_RECOVERYIMAGE_TARGET),)

intermediates := $(call intermediates-dir-for,PACKAGING,recovery_patch)

RECOVERY_FROM_BOOT_PATCH := $(intermediates)/recovery_from_boot.p

$(RECOVERY_FROM_BOOT_PATCH): $(INSTALLED_RECOVERYIMAGE_TARGET) \

                             $(INSTALLED_BOOTIMAGE_TARGET) \

			     $(HOST_OUT_EXECUTABLES)/imgdiff \

	                     $(HOST_OUT_EXECUTABLES)/bsdiff

	@echo "Construct recovery from boot"

	mkdir -p $(dir $@)

	PATH=$(HOST_OUT_EXECUTABLES):$$PATH $(HOST_OUT_EXECUTABLES)/imgdiff $(INSTALLED_BOOTIMAGE_TARGET) $(INSTALLED_RECOVERYIMAGE_TARGET) $@

endif





$(INSTALLED_SYSTEMIMAGE): $(BUILT_SYSTEMIMAGE) $(RECOVERY_FROM_BOOT_PATCH) | $(ACP)

	@echo "Install system fs image: $@"

	$(copy-file-to-target)

	$(hide) $(call assert-max-file-size,$@ $(INSTALLED_RECOVERYIMAGE_TARGET),$(BOARD_SYSTEMIMAGE_MAX_SIZE))

	$(hide) $(call assert-max-file-size,$@ $(RECOVERY_FROM_BOOT_PATCH),$(BOARD_SYSTEMIMAGE_MAX_SIZE))



systemimage: $(INSTALLED_SYSTEMIMAGE)
@@ -788,6 +806,7 @@ endef 


built_ota_tools := \

	$(call intermediates-dir-for,EXECUTABLES,applypatch)/applypatch \

	$(call intermediates-dir-for,EXECUTABLES,applypatch_static)/applypatch_static \

	$(call intermediates-dir-for,EXECUTABLES,check_prereq)/check_prereq \

	$(call intermediates-dir-for,EXECUTABLES,updater)/updater

$(BUILT_TARGET_FILES_PACKAGE): PRIVATE_OTA_TOOLS := $(built_ota_tools)
@@ -873,6 +892,7 @@ target-files-package: $(BUILT_TARGET_FILES_PACKAGE) 


ifneq ($(TARGET_SIMULATOR),true)

ifneq ($(TARGET_PRODUCT),sdk)

ifneq ($(TARGET_PRODUCT),generic)



name := $(TARGET_PRODUCT)

ifeq ($(TARGET_BUILD_TYPE),debug)
@@ -894,6 +914,7 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) otatools 
.PHONY: otapackage

otapackage: $(INTERNAL_OTA_PACKAGE_TARGET)



endif    # TARGET_PRODUCT != generic

endif    # TARGET_PRODUCT != sdk

endif    # TARGET_SIMULATOR != true

core/droiddoc.mk

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ droiddoc := \ 
	$(HOST_OUT_JAVA_LIBRARIES)/clearsilver$(COMMON_JAVA_PACKAGE_SUFFIX) \

	$(HOST_OUT_SHARED_LIBRARIES)/libclearsilver-jni$(HOST_JNILIB_SUFFIX)



$(full_target): PRIVATE_DOCLETPATH := $(HOST_OUT_JAVA_LIBRARIES)/clearsilver$(COMMON_JAVA_PACKAGE_SUFFIX):$(HOST_OUT_JAVA_LIBRARIES)/droiddoc$(COMMON_JAVA_PACKAGE_SUFFIX)

$(full_target): PRIVATE_DOCLETPATH := $(HOST_OUT_JAVA_LIBRARIES)/clearsilver$(COMMON_JAVA_PACKAGE_SUFFIX):$(HOST_OUT_JAVA_LIBRARIES)/droiddoc$(COMMON_JAVA_PACKAGE_SUFFIX):$(HOST_OUT_JAVA_LIBRARIES)/apicheck$(COMMON_JAVA_PACKAGE_SUFFIX)

$(full_target): PRIVATE_CURRENT_BUILD := -hdf page.build $(BUILD_ID)-$(BUILD_NUMBER)

$(full_target): PRIVATE_CURRENT_TIME :=  -hdf page.now "$(shell date "+%d %b %Y %k:%M")"

$(full_target): PRIVATE_TEMPLATE_DIR := $(LOCAL_DROIDDOC_TEMPLATE_DIR)

core/tasks/cts.mk

+3 −0
Original line number Diff line number Diff line
@@ -61,10 +61,13 @@ CTS_CASE_LIST := \ 
	CtsMediaTestCases \

	CtsOsTestCases \

	CtsPermissionTestCases \

	CtsPermission2TestCases \

	CtsProviderTestCases \

	CtsTelephonyTestCases \

	CtsTextTestCases \

	CtsUtilTestCases \

	CtsViewTestCases \

	CtsWebkitTestCases \

	CtsWidgetTestCases \

	CtsNetTestCases \

	SignatureTest \

target/product/sdk.mk

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ PRODUCT_PACKAGES := \ 
	OpenWnn \

	libWnnEngDic \

	libWnnJpnDic \

	libWnnZHCNDic \

	libwnndict \

	ApiDemos \

	GestureBuilder \