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

Commit 0f28440f authored by Yuntao Xu's avatar Yuntao Xu Committed by Automerger Merge Worker
Browse files

Merge "add LOCAL_DISABLE_TEST_CONFIG logic" am: f6cff221 am: cfc1765c 

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

Change-Id: I22a0925bca0601c4dc39375b2da4fdc340e7cefb
parents 5ef69b1e cfc1765c

core/base_rules.mk

+6 −0
Original line number Diff line number Diff line
@@ -759,6 +759,12 @@ ifeq (,$(test_config)) 
endif

is_instrumentation_test :=



# Currently this flag variable is true only for the `android_test_helper_app` type module

# which should not have any .config file

ifeq (true, $(LOCAL_DISABLE_TEST_CONFIG))

  test_config :=

endif



# Make sure we only add the files once for multilib modules.

ifdef $(my_prefix)$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_compat_files

  # Sync the auto_test_config value for multilib modules.

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ LOCAL_DEX_PREOPT_GENERATE_PROFILE:= 
LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING:=

LOCAL_DEX_PREOPT:= # '',true,false

LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG:=

LOCAL_DISABLE_TEST_CONFIG:=

LOCAL_DISABLE_RESOLVE_SUPPORT_LIBRARIES:=

LOCAL_DONT_CHECK_MODULE:=

# Don't delete the META_INF dir when merging static Java libraries.