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

Commit 73b05b52 authored by Spandan Das's avatar Spandan Das Committed by Automerger Merge Worker
Browse files

Merge "Drop RRO autogeneration for soong apps" into main am: d871e653 am: 78ec927a 

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



Change-Id: I1b8b84d807757c066c94250e04a5c89cca5fe520
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1e03c46f 78ec927a

core/soong_app_prebuilt.mk

+0 −24
Original line number Diff line number Diff line
@@ -224,30 +224,6 @@ 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)))