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

Commit f50d2cac authored by Nate Myren's avatar Nate Myren Committed by Automerger Merge Worker
Browse files

Merge "Set appcompat system properties flag if userdebug/eng" into main am:... 

Merge "Set appcompat system properties flag if userdebug/eng" into main am: 7de8a01c am: c39dc6a8

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



Change-Id: Iac2b233e02104a34e4b39ab8100a94f9db2ba954
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 93dc702a c39dc6a8

core/android_soong_config_vars.mk

+4 −2
Original line number Diff line number Diff line
@@ -105,8 +105,10 @@ $(call add_soong_config_var_value,ANDROID,release_binder_death_recipient_weak_fr 
$(call add_soong_config_var_value,ANDROID,release_package_libandroid_runtime_punch_holes,$(RELEASE_PACKAGE_LIBANDROID_RUNTIME_PUNCH_HOLES))



$(call add_soong_config_var_value,ANDROID,release_selinux_data_data_ignore,$(RELEASE_SELINUX_DATA_DATA_IGNORE))



$(call add_soong_config_var_value,ANDROID,release_write_appcompat_override_system_properties,$(RELEASE_WRITE_APPCOMPAT_OVERRIDE_SYSTEM_PROPERTIES))

ifneq (,$(filter eng userdebug,$(TARGET_BUILD_VARIANT)))

    # write appcompat system properties on userdebug and eng builds

    $(call add_soong_config_var_value,ANDROID,release_write_appcompat_override_system_properties,true)

endif



# Enable system_server optimizations by default unless explicitly set or if

# there may be dependent runtime jars.