From eb2648eacc8af72fb986af3402ba0602066276a3 Mon Sep 17 00:00:00 2001 From: Nate Myren Date: Thu, 30 May 2024 19:03:56 +0000 Subject: [PATCH] Set appcompat system properties flag if userdebug/eng Bug: 331307495 Test: m (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c7d08b74321a355c5a5daefdb899d1ac63b861fa) Merged-In: I7d3080487b60536f5948ab1482a3fd4aee8371d4 Change-Id: I7d3080487b60536f5948ab1482a3fd4aee8371d4 --- core/android_soong_config_vars.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 127731f16e..ea6ebd3f0f 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -114,8 +114,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.