Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optimizations #12

Open
wants to merge 31 commits into
base: lp5.1
Choose a base branch
from
Open

Optimizations #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
66e26ed
Remove --block
lozo2010 Jul 28, 2015
06eb8ec
pngquant
lozo2010 Jul 31, 2015
320929a
Merge pull request #1 from SlimRoms/lp5.1
lozo2010 Aug 1, 2015
6767fa1
Merge pull request #2 from SlimRoms/lp5.1
lozo2010 Aug 6, 2015
a3d7327
Merge pull request #3 from SlimRoms/lp5.1
lozo2010 Aug 12, 2015
978ef6e
Merge pull request #4 from SlimRoms/lp5.1
lozo2010 Aug 17, 2015
cf48e07
Merge pull request #5 from SlimRoms/lp5.1
lozo2010 Aug 25, 2015
595224e
Automatizar compilacion
lozo2010 Aug 28, 2015
9852211
Editar build.prop
lozo2010 Aug 29, 2015
e4323ac
Use Qualcomm Snapdragon LLVM Compiler 3.6
Aug 8, 2015
a21bd17
Use Qualcomm Snapdragon LLVM Compiler 3.6
lozo2010 Aug 29, 2015
c07cd68
Use Qualcomm Snapdragon LLVM Compiler 3.6
Aug 8, 2015
8ecbfd1
New tools
lozo2010 Aug 31, 2015
6591c6f
Add UKM data [2/2]
lozo2010 Sep 1, 2015
d453d32
Add EsExplorer [2/2]
lozo2010 Sep 1, 2015
911e1e9
Update ota_from_target_files
lozo2010 Sep 1, 2015
f62aa57
fix new tools
Moludos Sep 1, 2015
9fb18a1
fix new tools
Moludos Sep 1, 2015
3c3fa87
Merge pull request #6 from TeamNuclear/newtool
Moludos Sep 2, 2015
795d46b
Optimizations
Moludos Sep 4, 2015
737e56c
fix esFileExplorer
lozo2010 Sep 4, 2015
254b827
Merge pull request #7 from SlimRoms/lp5.1
Moludos Sep 6, 2015
3f5ff66
Merge pull request #8 from TeamNuclear/lp5.1
Moludos Sep 6, 2015
70f51cd
Merge pull request #9 from SlimRoms/lp5.1
lozo2010 Sep 10, 2015
84a38f6
Some fixes
Moludos Sep 10, 2015
727477a
Merge pull request #10 from SlimRoms/lp5.1
lozo2010 Sep 12, 2015
93eda25
Merge pull request #11 from SlimRoms/lp5.1
Moludos Sep 22, 2015
c102b1e
Merge branch 'lp5.1' of https://github.com/SlimRoms/android_build int…
lozo2010 Oct 7, 2015
a7e6cc2
git push origin lp5.1Merge branch 'SlimRoms-lp5.1' into lp5.1
lozo2010 Oct 7, 2015
7691ee1
Merge branch 'optimizations' into lp5.1
lozo2010 Oct 7, 2015
7aca52d
git push origin optimizationsMerge branch 'lp5.1' into optimizations
lozo2010 Oct 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions core/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -912,6 +912,9 @@ ifneq ($(OTA_PACKAGE_SIGNING_KEY),)
PRODUCT_EXTRA_RECOVERY_KEYS := $(DEFAULT_SYSTEM_DEV_CERTIFICATE)
endif

# Optimizaciones Nuclear
include $(BUILD_SYSTEM)/nuclearopts.mk

# Generate a file containing the keys that will be read by the
# recovery binary.
RECOVERY_INSTALL_OTA_KEYS := \
Expand Down Expand Up @@ -972,7 +975,9 @@ $(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTIMG) $(recovery_ramdisk) \
ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY))
$(BOOT_SIGNER) /recovery $@ $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).pk8 $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).x509.pem $@
endif
ifneq ($(NUCLEAR_IGNORE_RECOVERY_SIZE),true)
$(hide) $(call assert-max-image-size,$@,$(BOARD_RECOVERYIMAGE_PARTITION_SIZE))
endif
@echo -e ${CL_CYN}"Made recovery image: $@"${CL_RST}

endif # BOARD_CUSTOM_BOOTIMG_MK
Expand Down Expand Up @@ -1031,7 +1036,13 @@ INTERNAL_SYSTEMIMAGE_FILES := $(filter $(TARGET_OUT)/%, \
$(PDK_FUSION_SYSIMG_FILES) \
$(RECOVERY_RESOURCE_ZIP))

FULL_SYSTEMIMAGE_DEPS := $(INTERNAL_SYSTEMIMAGE_FILES) $(INTERNAL_USERIMAGES_DEPS)
systemimage-squisher: $(INTERNAL_SYSTEMIMAGE_FILES)
@echo -e ${CL_YLW}"Optimizing PNGs to Shrink ROM Size!"${CL_RST}
$(hide) APKCERTS=$(APKCERTS_FILE) $(SQUISHER_SCRIPT) $@

.PHONY: systemimage-squisher

FULL_SYSTEMIMAGE_DEPS := $(INTERNAL_SYSTEMIMAGE_FILES) $(INTERNAL_USERIMAGES_DEPS) systemimage-squisher
# -----------------------------------------------------------------
# installed file list
# Depending on anything that $(BUILT_SYSTEMIMAGE) depends on.
Expand Down Expand Up @@ -1710,7 +1721,6 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS)
@echo -e ${CL_YLW}"Package OTA:"${CL_RST}" $@"
$(hide) MKBOOTIMG=$(MKBOOTIMG) \
$(OTA_FROM_TARGET_SCRIPT) -v \
--block \
$(if $(WITH_LZMA_OTA), -z) \
-p $(HOST_OUT) \
-k $(KEY_CERT_PAIR) \
Expand All @@ -1733,9 +1743,10 @@ endif

bacon: otapackage
$(hide) ln -f $(INTERNAL_OTA_PACKAGE_TARGET) $(SLIM_TARGET_PACKAGE)
$(hide) $(MD5SUM) $(SLIM_TARGET_PACKAGE) > $(SLIM_TARGET_PACKAGE).md5sum
@echo -e ${CL_CYN}"Package Complete: $(SLIM_TARGET_PACKAGE)"${CL_RST}

ifdef FINISHER_SCRIPT
@echo -e ${CL_YLW}"Running finisher..."${CL_RST}
$(hide) $(FINISHER_SCRIPT) $@
endif
bootzip: bootimage
$(BOOT_ZIP_FROM_IMAGE_SCRIPT) \
$(recovery_fstab) \
Expand Down
80 changes: 70 additions & 10 deletions core/binary.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,19 @@ else
endif
endif

ifeq ($(USE_CLANG_QCOM),true)
ifndef LOCAL_IS_HOST_MODULE
ifeq ($(LOCAL_MODULE),$(filter $(LOCAL_MODULE),$(CLANG_QCOM_FORCE_COMPILE_MODULES)))
LOCAL_CLANG := true
endif
endif
endif

ifdef SM_VENDOR
# Include sabermod build system configs
include $(SM_VENDOR)/build/sm.mk
endif

# The following LOCAL_ variables will be modified in this file.
# Because the same LOCAL_ variables may be used to define modules for both 1st arch and 2nd arch,
# we can't modify them in place.
Expand Down Expand Up @@ -184,6 +197,29 @@ endif

my_compiler_dependencies :=


####################################################
## Add LTO flags if LTO is turned on/supported
## and we aren't building a host module.
####################################################
ifeq ($(strip $(LOCAL_LTO)),true)
ifeq (1,$(words $(filter $(LOCAL_DISABLE_LTO),$(LOCAL_MODULE))))
ifneq ($(strip $(LOCAL_CLANG)),true)
ifeq ($(strip $(LOCAL_IS_HOST_MODULE)),)
my_cflags_CLANG_QCOM += $(TARGET_LTO_CFLAGS)
my_ldflags_CLANG_QCOM += $(TARGET_LTO_LDFLAGS)
my_cppflags_CLANG_QCOM += $(TARGET_LTO_CFLAGS)
my_asflags_CLANG_QCOM += $(TARGET_LTO_CFLAGS)
my_target_global_cflags += $(TARGET_LTO_CFLAGS)
my_target_global_cppflags += $(TARGET_LTO_CFLAGS)
my_target_global_ldflags += $(TARGET_LTO_LDFLAGS)
LOCAL_CONLYFLAGS += $(TARGET_LTO_CFLAGS)
LOCAL_CPPFLAGS += $(TARGET_LTO_CFLAGS)
endif
endif
endif
endif

##################################################################
## Add FDO flags if FDO is turned on and supported
## Please note that we will do option filtering during FDO build.
Expand Down Expand Up @@ -242,10 +278,14 @@ my_target_global_cppflags :=
endif # LOCAL_SDK_VERSION

ifeq ($(my_clang),true)
my_target_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_TARGET_GLOBAL_CFLAGS)
my_target_global_cppflags += $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_TARGET_GLOBAL_CPPFLAGS)
my_target_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_TARGET_GLOBAL_LDFLAGS)
my_target_c_includes += $(CLANG_CONFIG_EXTRA_TARGET_C_INCLUDES)
ifeq ($(USE_CLANG_QCOM)$(filter $(LOCAL_MODULE),$(CLANG_QCOM_DONT_USE_MODULES)),true)
include $(BUILD_SYSTEM)/clang/clang_qcom_global.mk
else
my_target_c_includes += $(CLANG_CONFIG_EXTRA_TARGET_C_INCLUDES)
my_target_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_TARGET_GLOBAL_CFLAGS)
my_target_global_cppflags += $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_TARGET_GLOBAL_CPPFLAGS)
my_target_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_TARGET_GLOBAL_LDFLAGS)
endif
else
my_target_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_CFLAGS)
my_target_global_cppflags += $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_CPPFLAGS)
Expand Down Expand Up @@ -365,8 +405,17 @@ normal_objects_mode := $(if $(LOCAL_ARM_MODE),$(LOCAL_ARM_MODE),thumb)
arm_objects_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)$(arm_objects_mode)_CFLAGS)
normal_objects_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)$(normal_objects_mode)_CFLAGS)
ifeq ($(strip $(my_clang)),true)
arm_objects_cflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(arm_objects_cflags))
normal_objects_cflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(normal_objects_cflags))
ifndef LOCAL_IS_HOST_MODULE
ifeq ($(USE_CLANG_QCOM)$(filter $(LOCAL_MODULE),$(CLANG_QCOM_DONT_USE_MODULES)),true)
include $(BUILD_SYSTEM)/clang/clang_qcom_objects.mk
else
arm_objects_cflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(arm_objects_cflags))
normal_objects_cflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(normal_objects_cflags))
endif
else
arm_objects_cflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(arm_objects_cflags))
normal_objects_cflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(normal_objects_cflags))
endif
endif

else
Expand Down Expand Up @@ -923,10 +972,21 @@ endif
###########################################################

ifeq ($(my_clang),true)
my_cflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(my_cflags))
my_cppflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(my_cppflags))
my_asflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(my_asflags))
my_ldflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(my_ldflags))
ifndef LOCAL_IS_HOST_MODULE
ifeq ($(USE_CLANG_QCOM)$(filter $(LOCAL_MODULE),$(CLANG_QCOM_DONT_USE_MODULES)),true)
include $(BUILD_SYSTEM)/clang/clang_qcom_local.mk
else
my_cflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(my_cflags))
my_cppflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(my_cppflags))
my_asflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(my_asflags))
my_ldflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(my_ldflags))
endif
else
my_cflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(my_cflags))
my_cppflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(my_cppflags))
my_asflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(my_asflags))
my_ldflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(my_ldflags))
endif
endif

ifeq ($(LOCAL_FDO_SUPPORT), true)
Expand Down
Loading