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

Commit 29e347e4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes Iacfe74ae,I7c380b60 am: ce131638 am: 5771787c 

Original change: https://android-review.googlesource.com/c/platform/build/+/1365306

Change-Id: I81debee224374fd8f60d1cad12a4e7ac6c0591ab
parents 81e22595 5771787c

core/Makefile

+14 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ SOONG_CONV := $(sort $(SOONG_CONV)) 
SOONG_CONV_DATA := $(call intermediates-dir-for,PACKAGING,soong_conversion)/soong_conv_data

$(SOONG_CONV_DATA):

	@rm -f $@

	@$(foreach s,$(SOONG_CONV),echo "$(s),$(SOONG_CONV.$(s).TYPE),$(sort $(SOONG_CONV.$(s).PROBLEMS)),$(sort $(filter-out $(SOONG_ALREADY_CONV),$(SOONG_CONV.$(s).DEPS)))" >>$@;)

	@$(foreach s,$(SOONG_CONV),echo "$(s),$(SOONG_CONV.$(s).TYPE),$(sort $(SOONG_CONV.$(s).PROBLEMS)),$(sort $(filter-out $(SOONG_ALREADY_CONV),$(SOONG_CONV.$(s).DEPS))),$(sort $(SOONG_CONV.$(s).MAKEFILES)),$(sort $(SOONG_CONV.$(s).INSTALLED))" >>$@;)



SOONG_TO_CONVERT_SCRIPT := build/make/tools/soong_to_convert.py

SOONG_TO_CONVERT := $(PRODUCT_OUT)/soong_to_convert.txt
@@ -485,6 +485,19 @@ $(SOONG_TO_CONVERT): $(SOONG_CONV_DATA) $(SOONG_TO_CONVERT_SCRIPT) 
	$(hide) $(SOONG_TO_CONVERT_SCRIPT) $< >$@

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



MK2BP_CATALOG_SCRIPT := build/make/tools/mk2bp_catalog.py

MK2BP_REMAINING_HTML := $(PRODUCT_OUT)/mk2bp_remaining.html

$(MK2BP_REMAINING_HTML): PRIVATE_CODE_SEARCH_BASE_URL := "https://cs.android.com/android/platform/superproject/+/master:"

$(MK2BP_REMAINING_HTML): $(SOONG_CONV_DATA) $(MK2BP_CATALOG_SCRIPT)

	@rm -f $@

	$(hide) $(MK2BP_CATALOG_SCRIPT) \

		--device=$(TARGET_DEVICE) \

		--title="Remaining Android.mk files for $(TARGET_DEVICE)-$(TARGET_BUILD_VARIANT)" \

		--codesearch=$(PRIVATE_CODE_SEARCH_BASE_URL) \

		--out_dir="$(OUT_DIR)" \

		> $@

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



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

# Modules use -Wno-error, or added default -Wall -Werror

WALL_WERROR := $(PRODUCT_OUT)/wall_werror.txt

core/binary.mk

+4 −0
Original line number Diff line number Diff line
@@ -1818,6 +1818,10 @@ SOONG_CONV.$(LOCAL_MODULE).DEPS := \ 
        $(my_shared_libraries) \

        $(my_system_shared_libraries))

SOONG_CONV.$(LOCAL_MODULE).TYPE := native

SOONG_CONV.$(LOCAL_MODULE).MAKEFILES := \

    $(SOONG_CONV.$(LOCAL_MODULE).MAKEFILES) $(LOCAL_MODULE_MAKEFILE)

SOONG_CONV.$(LOCAL_MODULE).INSTALLED:= \

    $(SOONG_CONV.$(LOCAL_MODULE).INSTALLED) $(LOCAL_INSTALLED_MODULE)

SOONG_CONV := $(SOONG_CONV) $(LOCAL_MODULE)



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

core/java_common.mk

+4 −4
Original line number Diff line number Diff line
@@ -6,10 +6,6 @@ ifneq ($(filter ../%,$(LOCAL_SRC_FILES)),) 
my_soong_problems += dotdot_srcs

endif



ifneq (,$(LOCAL_JNI_SHARED_LIBRARIES))

my_soong_problems += jni_libs

endif



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

## Java version

###########################################################
@@ -546,6 +542,10 @@ SOONG_CONV.$(LOCAL_MODULE).DEPS := \ 
    $(LOCAL_JAVA_LIBRARIES) \

    $(LOCAL_JNI_SHARED_LIBRARIES)

SOONG_CONV.$(LOCAL_MODULE).TYPE := java

SOONG_CONV.$(LOCAL_MODULE).MAKEFILES := \

    $(SOONG_CONV.$(LOCAL_MODULE).MAKEFILES) $(LOCAL_MODULE_MAKEFILE)

SOONG_CONV.$(LOCAL_MODULE).INSTALLED := \

    $(SOONG_CONV.$(LOCAL_MODULE).INSTALLED) $(LOCAL_INSTALLED_MODULE)

SOONG_CONV := $(SOONG_CONV) $(LOCAL_MODULE)



endif

tools/mk2bp_catalog.py

0 → 100755
+892 −0

File added.

Preview size limit exceeded, changes collapsed.

tools/soong_to_convert.py

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ def process(reader): 
    reverse_deps = dict()

    module_types = dict()



    for (module, module_type, problem, dependencies) in reader:

    for (module, module_type, problem, dependencies, makefiles, installed) in reader:

        module_types[module] = module_type

        problems[module] = problem

        deps[module] = [d for d in dependencies.strip().split(' ') if d != ""]