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

Commit 4b60ee5b authored by Joe Onorato's avatar Joe Onorato Committed by Android (Google) Code Review
Browse files

Merge changes I8f95f3f8,Ic2e384ad into nyc-dev 

* changes:
  Add generation of a module-info.json file
  Remove unused module-info.txt generation.
parents e7712514 48bd6f53

core/Makefile

+0 −14
Original line number Diff line number Diff line
@@ -385,20 +385,6 @@ ifneq (,$(TARGET_BUILD_APPS)) 
  $(call dist-for-goals, apps_only, $(APKCERTS_FILE):apkcerts.txt)

endif



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

# module info file

ifdef CREATE_MODULE_INFO_FILE

  MODULE_INFO_FILE := $(PRODUCT_OUT)/module-info.txt

  $(info Generating $(MODULE_INFO_FILE)...)

  $(shell rm -f $(MODULE_INFO_FILE))

  $(foreach m,$(ALL_MODULES), \

    $(shell echo "NAME=\"$(m)\"" \

	"PATH=\"$(strip $(ALL_MODULES.$(m).PATH))\"" \

	"TAGS=\"$(strip $(filter-out _%,$(ALL_MODULES.$(m).TAGS)))\"" \

	"BUILT=\"$(strip $(ALL_MODULES.$(m).BUILT))\"" \

	"INSTALLED=\"$(strip $(ALL_MODULES.$(m).INSTALLED))\"" >> $(MODULE_INFO_FILE)))

endif



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



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

core/tasks/module-info.mk

0 → 100644
+24 −0
Original line number Diff line number Diff line 
# Print a list of the modules that could be built



MODULE_INFO_JSON := $(PRODUCT_OUT)/module-info.json



$(MODULE_INFO_JSON):

	@echo Generating $@

	$(hide) echo -ne '{\n ' > $@

	$(hide) echo -ne $(foreach m, $(sort $(ALL_MODULES)), \

		' "$(m)": {' \

			'"class": [$(foreach w,$(sort $(ALL_MODULES.$(m).CLASS)),"$(w)", )], ' \

			'"path": [$(foreach w,$(sort $(ALL_MODULES.$(m).PATH)),"$(w)", )], ' \

			'"tags": [$(foreach w,$(sort $(ALL_MODULES.$(m).TAGS)),"$(w)", )], ' \

			'"installed": [$(foreach w,$(sort $(ALL_MODULES.$(m).INSTALLED)),"$(w)", )], ' \

			'},\n' \

	 ) | sed -e 's/, *\]/]/g' -e 's/, *\}/ }/g' -e '$$s/,$$//' >> $@

	$(hide) echo '}' >> $@





# If ONE_SHOT_MAKEFILE is set, our view of the world is smaller, so don't

# rewrite the file in that came.

ifndef ONE_SHOT_MAKEFILE

files: $(MODULE_INFO_JSON)

endif