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

Commit ac8da9d9 authored by Rashed Abdel-Tawab's avatar Rashed Abdel-Tawab Committed by Michael Bestas
Browse files

build: Add build flag to disable Lineage SDK usage 

Change-Id: Ib4d966b1bcc5cf1578a28c0fcd3f9077c14af573

build: Re-add I_WANT_A_QUAIL_STAR

* This partially reverts commit c7d6cc2a
* Move cmsdk check to checkapi-cm, android checkapi shouldn't be
  under this ifeq

Change-Id: Ia7c9853cc5f978ed533f2879367428eb1d64bd46
parent 8c7a0822

core/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -1486,9 +1486,11 @@ $(BUILT_SYSTEMIMAGE): $(FULL_SYSTEMIMAGE_DEPS) $(INSTALLED_FILES_FILE) $(BUILD_I 
ifndef I_WANT_A_QUAIL_STAR

ifneq ($(WITHOUT_CHECK_API),true)

$(BUILT_SYSTEMIMAGE): checkapi

ifneq ($(TARGET_DISABLE_LINEAGE_SDK), true)

$(BUILT_SYSTEMIMAGE): checkapi-lineage

endif

endif

endif



INSTALLED_SYSTEMIMAGE := $(PRODUCT_OUT)/system.img

SYSTEMIMAGE_SOURCE_DIR := $(TARGET_OUT)

core/package_internal.mk

+6 −0
Original line number Diff line number Diff line
@@ -509,11 +509,13 @@ else # LOCAL_SDK_RES_VERSION 
framework_res_package_export := \

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



ifneq ($(TARGET_DISABLE_LINEAGE_SDK), true)

# Avoid possible circular dependency with our platform-res

ifneq ($(LOCAL_IGNORE_SUBDIR), true)

lineage_plat_res_package_export := \

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

endif # LOCAL_IGNORE_SUBDIR

endif



# We can't depend directly on the export.apk file; it won't get its

# PRIVATE_ vars set up correctly if we do.  Instead, depend on the
@@ -521,10 +523,12 @@ endif # LOCAL_IGNORE_SUBDIR 
framework_res_package_export_deps := \

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



ifneq ($(TARGET_DISABLE_LINEAGE_SDK), true)

ifneq ($(LOCAL_IGNORE_SUBDIR), true)

lineage_plat_res_package_export_deps := \

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

endif # LOCAL_IGNORE_SUBDIR

endif



endif # LOCAL_SDK_RES_VERSION

all_library_res_package_exports := \
@@ -537,12 +541,14 @@ all_library_res_package_export_deps := \ 
    $(foreach lib,$(LOCAL_RES_LIBRARIES),\

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



ifneq ($(TARGET_DISABLE_LINEAGE_SDK), true)

ifneq ($(LOCAL_IGNORE_SUBDIR), true)

all_library_res_package_exports += \

    $(lineage_plat_res_package_export)

all_library_res_package_export_deps += \

    $(lineage_plat_res_package_export_deps)

endif # LOCAL_IGNORE_SUBDIR

endif



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

$(LOCAL_INTERMEDIATE_TARGETS): \