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

Commit 5f2a3bd9 authored by Adnan Begovic's avatar Adnan Begovic Committed by Michael Bestas
Browse files

build: Make sure we're building our secondary resource package as dependency. 

  This allows us to reference internal or public resources without
  going explicitily through the platform sdk.

Change-Id: Iba361a3dcd20bc62a06e600e0240fb09d4e7bda4
parent a62cde13

core/package_internal.mk

+14 −0
Original line number Diff line number Diff line
@@ -406,6 +406,14 @@ framework_res_package_export := \ 
else # LOCAL_SDK_RES_VERSION

framework_res_package_export := \

    $(call intermediates-dir-for,APPS,framework-res,,COMMON)/package-export.apk



# Avoid possible circular dependency with our platform-res

lineage_plat_res_package_export := \

    $(call intermediates-dir-for,APPS,org.lineageos.platform-res,,COMMON)/package-export.apk



lineage_plat_res_package_export_deps := \

    $(dir $(lineage_plat_res_package_export))src/R.stamp



endif # LOCAL_SDK_RES_VERSION

endif # LOCAL_NO_STANDARD_LIBRARIES
@@ -418,6 +426,12 @@ all_library_res_package_export_deps := \ 
    $(framework_res_package_export) \

    $(foreach lib,$(LOCAL_RES_LIBRARIES),\

        $(call intermediates-dir-for,APPS,$(lib),,COMMON)/src/R.stamp)



all_library_res_package_exports += \

    $(lineage_plat_res_package_export)

all_library_res_package_export_deps += \

    $(lineage_plat_res_package_export_deps)



$(resource_export_package) $(R_file_stamp) $(LOCAL_BUILT_MODULE): $(all_library_res_package_export_deps)

$(LOCAL_INTERMEDIATE_TARGETS): \

    PRIVATE_AAPT_INCLUDES := $(all_library_res_package_exports)