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

Commit dd9aee16 authored by Dan Willemsen's avatar Dan Willemsen Committed by Gerrit Code Review
Browse files

Merge "Record module type statistics"

parents 65de8e44 3bf15e71

core/Makefile

+9 −0
Original line number Diff line number Diff line
@@ -399,6 +399,15 @@ ifdef CREATE_MODULE_INFO_FILE 
	"INSTALLED=\"$(strip $(ALL_MODULES.$(m).INSTALLED))\"" >> $(MODULE_INFO_FILE)))

endif



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

# build system stats

BUILD_SYSTEM_STATS := $(PRODUCT_OUT)/build_system_stats.txt

$(BUILD_SYSTEM_STATS):

	@rm -f $@

	@$(foreach s,$(STATS.MODULE_TYPE),echo "modules_type_make,$(s),$(words $(STATS.MODULE_TYPE.$(s)))" >>$@;)

	@$(foreach s,$(STATS.SOONG_MODULE_TYPE),echo "modules_type_soong,$(s),$(STATS.SOONG_MODULE_TYPE.$(s))" >>$@;)

$(call dist-for-goals,droidcore,$(BUILD_SYSTEM_STATS))



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



# The dev key is used to sign this package, and as the key required

core/base_rules.mk

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ 
# limitations under the License.

#



# Catch users that directly include base_rules.mk

$(call record-module-type,base_rules)



# Users can define base-rules-hook in their buildspec.mk to perform

# arbitrary operations as each module is included.

ifdef base-rules-hook

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ LOCAL_REPLACE_PREBUILT_APK_INSTALLED:= 
LOCAL_NDK_VERSION:=current

LOCAL_COPY_TO_INTERMEDIATE_LIBRARIES:=

LOCAL_LOGTAGS_FILES:=

LOCAL_RECORDED_MODULE_TYPE:=



# arch specific variables

LOCAL_SRC_FILES_$(TARGET_ARCH):=

core/copy_headers.mk

+1 −0
Original line number Diff line number Diff line 
###########################################################

## Copy headers to the install tree

###########################################################

$(call record-module-type,COPY_HEADERS)

ifneq ($(strip $(LOCAL_IS_HOST_MODULE)),)

  my_prefix := HOST_

else

core/definitions.mk

+42 −0
Original line number Diff line number Diff line
@@ -2840,6 +2840,48 @@ $(strip $(if $(filter $(TARGET_ARCH),$(1)),$(TARGET_ARCH),\ 
  $(if $(filter $(TARGET_2ND_ARCH),$(1)),$(TARGET_2ND_ARCH),$(if $(1),none))))

endef



# ###############################################################

# Set up statistics gathering

# ###############################################################

STATS.MODULE_TYPE := \

  HOST_STATIC_LIBRARY \

  HOST_SHARED_LIBRARY \

  STATIC_LIBRARY \

  SHARED_LIBRARY \

  EXECUTABLE \

  HOST_EXECUTABLE \

  PACKAGE \

  PHONY_PACKAGE \

  HOST_PREBUILT \

  PREBUILT \

  MULTI_PREBUILT \

  JAVA_LIBRARY \

  STATIC_JAVA_LIBRARY \

  HOST_JAVA_LIBRARY \

  DROIDDOC \

  COPY_HEADERS \

  NATIVE_TEST \

  NATIVE_BENCHMARK \

  HOST_NATIVE_TEST \

  FUZZ_TEST \

  HOST_FUZZ_TEST \

  STATIC_TEST_LIBRARY \

  HOST_STATIC_TEST_LIBRARY \

  NOTICE_FILE \

  HOST_DALVIK_JAVA_LIBRARY \

  HOST_DALVIK_STATIC_JAVA_LIBRARY \

  base_rules



$(foreach $(s),$(STATS.MODULE_TYPE),$(eval STATS.MODULE_TYPE.$(s) :=))

define record-module-type

$(strip $(if $(LOCAL_RECORDED_MODULE_TYPE),,

  $(if $(filter-out $(SOONG_ANDROID_MK),$(LOCAL_MODULE_MAKEFILE)),

    $(if $(filter $(1),$(STATS.MODULE_TYPE)),

      $(eval LOCAL_RECORDED_MODULE_TYPE := true)

        $(eval STATS.MODULE_TYPE.$(1) += 1),

      $(error Invalid module type: $(1))))))

endef



###########################################################

## Other includes

###########################################################