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

Commit 68a9a368 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/lineage-23.0' into a16

parents b2f5a6c3 63edc917

core/android_soong_config_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ $(call add_soong_config_var,ANDROID,TARGET_ADD_ROOT_EXTRA_VENDOR_SYMLINKS) 


# For BUILDING_GSI

$(call soong_config_set_bool,gsi,building_gsi,$(if $(filter true,$(BUILDING_GSI)),true,false))

$(call soong_config_set_bool,gsi,building_lineage_gsi,$(if $(filter true,$(BUILDING_LINEAGE_GSI)),true,false))



# For bootable/recovery

RECOVERY_API_VERSION := 3

core/product.mk

+2 −0
Original line number Diff line number Diff line
@@ -489,6 +489,8 @@ _product_single_value_vars += PRODUCT_NOT_DEBUGGABLE_IN_USERDEBUG 
# If set, the default value of the versionName of apps will include the build number.

_product_single_value_vars += PRODUCT_BUILD_APPS_WITH_BUILD_NUMBER



_product_single_value_vars += USE_SOONG_DEFINED_SYSTEM_IMAGE



# If set, build would generate system image from Soong-defined module.

_product_single_value_vars += PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE

target/product/gsi/Android.bp

+5 −3
Original line number Diff line number Diff line
@@ -205,9 +205,11 @@ android_system_image { 
        true: ["frameworks-base-overlays-debug"],

        default: [],

    }),

    enabled: select(soong_config_variable("gsi", "building_gsi"), {

        true: true,

        default: false,

    enabled: select((soong_config_variable("gsi", "building_gsi"),

                     soong_config_variable("gsi", "building_lineage_gsi")), {

        (true, true): false,

        (true, default): true,

        (default, default): false,

    }),

    multilib: {

        common: {

target/product/gsi_release.mk

+4 −1
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ 
#



BUILDING_GSI := true

ifneq ($(filter lineage_gsi_%,$(TARGET_PRODUCT)),)

BUILDING_LINEAGE_GSI := true

endif



PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \

    system/etc/init/config \
@@ -55,7 +58,7 @@ PRODUCT_PACKAGES += \ 
ifneq ($(PRODUCT_IS_AUTOMOTIVE),true)

    PRODUCT_PACKAGES += \

        gsi_overlay_framework \

        gsi_overlay_systemui \

        gsi_overlay_systemui

    PRODUCT_COPY_FILES += \

        device/generic/common/overlays/overlay-config.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/overlay/config/config.xml

endif

tools/aconfig/exported_flag_check/allow_flag_list.txt

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ com.android.bluetooth.flags.settings_can_control_hap_preset 
com.android.bluetooth.flags.unix_file_socket_creation_failure

com.android.graphics.flags.icon_load_drawable_return_null_when_uri_decode_fails

com.android.graphics.hwui.flags.animated_image_drawable_filter_bitmap

com.android.graphics.surfaceflinger.flags.disable_synthetic_vsync_for_performance

com.android.hardware.input.manage_key_gestures

com.android.healthfitness.flags.activity_intensity_db

com.android.healthfitness.flags.add_missing_access_logs