diff options
| author | Aurimas Liutikas <aurimas@google.com> | 2018-04-03 17:08:29 -0700 |
|---|---|---|
| committer | Aurimas Liutikas <aurimas@google.com> | 2018-04-03 17:08:29 -0700 |
| commit | 1d6c6dab0166669dc12433cbf6a54997f92f107d (patch) | |
| tree | 827b9c96f7ac4b16dddb488d4740c64f3500fd00 /tests/UsageStatsTest | |
| parent | 436f2235f00566e08b1c4fdd32be2495c7d22d40 (diff) | |
Migrate EasterEgg, JankBench, UiBench to androidx
Bug: 76692459
Test: make -j EasterEgg JankBench UiBench
Change-Id: Id9bed936dd1cb1cb4e1c0792618c9a3d608c1fb8
Diffstat (limited to 'tests/UsageStatsTest')
| -rw-r--r-- | tests/UsageStatsTest/Android.mk | 3 | ||||
| -rw-r--r-- | tests/UsageStatsTest/src/com/android/tests/usagestats/UsageLogActivity.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/UsageStatsTest/Android.mk b/tests/UsageStatsTest/Android.mk index 6735c7c8f787..5eed38c86657 100644 --- a/tests/UsageStatsTest/Android.mk +++ b/tests/UsageStatsTest/Android.mk @@ -6,7 +6,8 @@ LOCAL_MODULE_TAGS := tests # Only compile source java files in this apk. LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 +LOCAL_USE_AAPT2 := true +LOCAL_STATIC_ANDROID_LIBRARIES := androidx.legacy_legacy-support-v4 LOCAL_CERTIFICATE := platform diff --git a/tests/UsageStatsTest/src/com/android/tests/usagestats/UsageLogActivity.java b/tests/UsageStatsTest/src/com/android/tests/usagestats/UsageLogActivity.java index 05cac10f92c6..3480e96b3547 100644 --- a/tests/UsageStatsTest/src/com/android/tests/usagestats/UsageLogActivity.java +++ b/tests/UsageStatsTest/src/com/android/tests/usagestats/UsageLogActivity.java @@ -21,7 +21,7 @@ import android.app.usage.UsageStatsManager; import android.content.Context; import android.os.Bundle; import android.os.Handler; -import android.support.v4.util.CircularArray; +import androidx.collection.CircularArray; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; |