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

Commit b52bd8f8 authored by Liana Kazanova's avatar Liana Kazanova Committed by Gerrit Code Review
Browse files

Revert "Drop RRO autogeneration for soong apps" 

Revert submission 3362490-autogen_app_overlay

Reason for revert: DroidMonitor: Potential culprit for http://b/382076898 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:3362490-autogen_app_overlay

Change-Id: I297faa401f2663d338ba2297ea70dc85b32a0f5b
parent 6b1a0e1d

core/soong_app_prebuilt.mk

+24 −0
Original line number Diff line number Diff line
@@ -224,6 +224,30 @@ my_common := COMMON 
include $(BUILD_SYSTEM)/link_type.mk

endif # !LOCAL_IS_HOST_MODULE



ifeq (,$(filter tests,$(LOCAL_MODULE_TAGS)))

  ifdef LOCAL_SOONG_DEVICE_RRO_DIRS

    $(call append_enforce_rro_sources, \

        $(my_register_name), \

        false, \

        $(LOCAL_FULL_MANIFEST_FILE), \

        $(if $(LOCAL_EXPORT_PACKAGE_RESOURCES),true,false), \

        $(LOCAL_SOONG_DEVICE_RRO_DIRS), \

        vendor \

    )

  endif



  ifdef LOCAL_SOONG_PRODUCT_RRO_DIRS

    $(call append_enforce_rro_sources, \

        $(my_register_name), \

        false, \

        $(LOCAL_FULL_MANIFEST_FILE), \

        $(if $(LOCAL_EXPORT_PACKAGE_RESOURCES),true,false), \

        $(LOCAL_SOONG_PRODUCT_RRO_DIRS), \

        product \

    )

  endif

endif



ifdef LOCAL_PREBUILT_COVERAGE_ARCHIVE

  my_coverage_dir := $(TARGET_OUT_COVERAGE)/$(patsubst $(PRODUCT_OUT)/%,%,$(my_module_path))

  my_coverage_copy_pairs := $(foreach f,$(LOCAL_PREBUILT_COVERAGE_ARCHIVE),$(f):$(my_coverage_dir)/$(notdir  $(f)))