pa-fazil
/
android_build
mirror of https://github.com/fazilsheik96/android_build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Guard Compile time metadata information with LOCAL_ABI_CHECKER 

With this change additional metadata information will only be
captured for modules which will have LOCAL_ABI_CHECKER set to
true. Trimming of clag data is not needed as we limited scope
to particular modules which can be handled in module specific
make files.
Additionally , resetting abi_checker and include variables to
avoid stale information in module_info.json

CRs-Fixed: 2580673
Change-Id: Iab0c10c160d67df398add88c9a54a593f78d7d63
This commit is contained in:
Vinay Verma 2020-01-21 14:54:46 +05:30 committed by Phani Kumar P V
parent 9497ffe863
commit 10c1312052
5 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/base_rules.mk
View File

@ -765,6 +765,8 @@ ALL_MODULES += $(my_register_name)
# recursively expanded.
ALL_MODULES.$(my_register_name).CLASS := \
$(ALL_MODULES.$(my_register_name).CLASS) $(LOCAL_MODULE_CLASS)
ifdef LOCAL_ABI_CHECKER
ifeq ($(LOCAL_ABI_CHECKER),true)
ALL_MODULES.$(my_register_name).SRCS := \
$(ALL_MODULES.$(my_register_name).SRCS) $(LOCAL_SRC_FILES)
ALL_MODULES.$(my_register_name).STATIC := \
@ -773,11 +775,14 @@ ALL_MODULES.$(my_register_name).WSTATIC := \
$(ALL_MODULES.$(my_register_name).WSTATIC) $(LOCAL_WHOLE_STATIC_LIBRARIES)
ALL_MODULES.$(my_register_name).EXPORT := \
$(ALL_MODULES.$(my_register_name).EXPORT) $(LOCAL_EXPORT_C_INCLUDES)
# TODO(b/147688606): Partial revert of 87a04382bb341636d2103178c3f6a71edf433752
#ALL_MODULES.$(my_register_name).CFLAGS := \
# $(ALL_MODULES.$(my_register_name).CFLAGS) $(shell echo '$(LOCAL_CFLAGS)'| tr -d '"\')
ALL_MODULES.$(my_register_name).CFLAGS := \
$(ALL_MODULES.$(my_register_name).CFLAGS) $(LOCAL_CFLAGS)
ALL_MODULES.$(my_register_name).ABI_CHECKER := \
$(ALL_MODULES.$(my_register_name).ABI_CHECKER) $(LOCAL_ABI_CHECKER)
ALL_MODULES.$(my_register_name).INCS := \
$(ALL_MODULES.$(my_register_name).INCS) $(LOCAL_C_INCLUDES)
endif
endif
ALL_MODULES.$(my_register_name).PATH := \
$(ALL_MODULES.$(my_register_name).PATH) $(LOCAL_PATH)
ALL_MODULES.$(my_register_name).TAGS := \

2
core/prebuilt.mk
View File

@ -56,3 +56,5 @@ LOCAL_STATIC_LIBRARIES :=
LOCAL_WHOLE_STATIC_LIBRARIES :=
LOCAL_EXPORT_C_INCLUDES :=
LOCAL_CFLAGS :=
LOCAL_ABI_CHECKER :=
LOCAL_C_INCLUDES :=

2
core/shared_library.mk
View File

@ -67,6 +67,8 @@ LOCAL_STATIC_LIBRARIES :=
LOCAL_WHOLE_STATIC_LIBRARIES :=
LOCAL_EXPORT_C_INCLUDES :=
LOCAL_CFLAGS :=
LOCAL_ABI_CHECKER :=
LOCAL_C_INCLUDES :=
###########################################################
## Copy headers to the install tree

3
core/static_library.mk
View File

@ -53,6 +53,9 @@ LOCAL_STATIC_LIBRARIES :=
LOCAL_WHOLE_STATIC_LIBRARIES :=
LOCAL_EXPORT_C_INCLUDES :=
LOCAL_CFLAGS :=
LOCAL_ABI_CHECKER :=
LOCAL_C_INCLUDES :=
###########################################################
## Copy headers to the install tree

1
core/tasks/module-info.mk
View File

@ -25,6 +25,7 @@ $(MODULE_INFO_JSON):
'"wstatic": [$(foreach w,$(sort $(ALL_MODULES.$(m).WSTATIC)),"$(w)", )], ' \
'"export": [$(foreach w,$(sort $(ALL_MODULES.$(m).EXPORT)),"$(w)", )], ' \
'"cflags": [$(foreach w,$(sort $(ALL_MODULES.$(m).CFLAGS)),"$(w)", )], ' \
'"abi_checker": [$(foreach w,$(sort $(ALL_MODULES.$(m).ABI_CHECKER)),"$(w)", )], ' \
'"srcjars": [$(foreach w,$(sort $(ALL_MODULES.$(m).SRCJARS)),"$(w)", )], ' \
'"classes_jar": [$(foreach w,$(sort $(ALL_MODULES.$(m).CLASSES_JAR)),"$(w)", )], ' \
'},\n' \