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

Commit 2188cef0 authored by Liana Kazanova's avatar Liana Kazanova Committed by Automerger Merge Worker
Browse files

Merge "Revert "Drop RRO autogeneration for soong apps"" into main am: 7b81963b 

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



Change-Id: Ie6c51d11376a4df68c0357e3f7c40d2abe9c800e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1ae7e5d1 7b81963b

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)))