Merge "Use LOCAL_REQUIRED_MODULES instead of LOCAL_TARGET_REQUIRED_MODULES" am: 50b59...

am: 9f2d31f172

Change-Id: Ic8d0c2e1503456e76c9cc46874911a49a71d63e6

diff --cc core/tests/overlaytests/device/Android.mk
index 5630749,07594b4..c6d2a51
--- 1/core/tests/overlaytests/device/Android.mk
--- 2/core/tests/overlaytests/device/Android.mk
+++ b/core/tests/overlaytests/device/Android.mk
@@@ -19,9 -19,9 +19,9 @@@ LOCAL_SRC_FILES := $(call all-java-file
  LOCAL_MODULE_TAGS := tests
  LOCAL_PACKAGE_NAME := OverlayDeviceTests
  LOCAL_PRIVATE_PLATFORM_APIS := true
 -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
 +LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules
  LOCAL_COMPATIBILITY_SUITE := device-tests
- LOCAL_TARGET_REQUIRED_MODULES := \
+ LOCAL_REQUIRED_MODULES := \
      OverlayDeviceTests_AppOverlayOne \
      OverlayDeviceTests_AppOverlayTwo \
      OverlayDeviceTests_FrameworkOverlay