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

Commit 6704727b authored by Dan Shi's avatar Dan Shi Committed by Gerrit Code Review
Browse files

Merge "Add a flag to disable auto-generating test configs."

parents 896fa043 2035abfb

core/base_rules.mk

+13 −4
Original line number Diff line number Diff line
@@ -541,10 +541,18 @@ ifeq (,$(test_config)) 
    ifeq (true, $(LOCAL_IS_HOST_MODULE))

      is_instrumentation_test := false

    endif

    # If LOCAL_MODULE_CLASS is not APPS, it's certainly not an instrumentation

    # test. However, some packages for test data also have LOCAL_MODULE_CLASS

    # set to APPS. These will require flag LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG

    # to disable auto-generating test config file.

    ifneq (APPS, $(LOCAL_MODULE_CLASS))

      is_instrumentation_test := false

    endif

  endif

  # CTS modules can be used for test data, so test config files must be

  # explicitly created using AndroidTest.xml

  ifeq (,$(filter cts, $(LOCAL_COMPATIBILITY_SUITE)))

    ifneq (true, $(LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG))

      ifeq (true, $(filter true,$(is_native) $(is_instrumentation_test)))

        include $(BUILD_SYSTEM)/autogen_test_config.mk

        test_config := $(autogen_test_config_file)
@@ -552,6 +560,7 @@ ifeq (,$(test_config)) 
      endif

    endif

  endif

endif



is_instrumentation_test :=

core/clear_vars.mk

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

LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING:=

LOCAL_DEX_PREOPT:= # '',true,false,nostripping

LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG:=

LOCAL_DONT_CHECK_MODULE:=

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

LOCAL_DONT_DELETE_JAR_META_INF:=