diff options
| author | KOUSHIK PANUGANTI <kpanuganti@google.com> | 2018-04-19 15:42:10 -0700 |
|---|---|---|
| committer | KOUSHIK PANUGANTI <kpanuganti@google.com> | 2018-04-19 15:42:10 -0700 |
| commit | 2d59906d8433a00cfe38b62f1c4ff5ff0f10b59c (patch) | |
| tree | ee1269aca7a8b685aa1be0d8d05cfb2c9c1d6b44 /tests | |
| parent | f52d908eb53e90d09b1cdda39968fb76fac8b365 (diff) | |
| download | rs-2d59906d8433a00cfe38b62f1c4ff5ff0f10b59c.tar.gz | |
Migrated various apps under frameworks/rs/tests/java_api/CannyLive to androidx
Bug: 76692459
Test: make CannyLive
Change-Id: I9b8096493713614bf2818b6d7ab7129989c843da
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/java_api/CannyLive/Android.mk | 7 | ||||
| -rw-r--r-- | tests/java_api/CannyLive/src/com/android/example/cannylive/MainActivity.java | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/tests/java_api/CannyLive/Android.mk b/tests/java_api/CannyLive/Android.mk index 2e50becb..9481365e 100644 --- a/tests/java_api/CannyLive/Android.mk +++ b/tests/java_api/CannyLive/Android.mk @@ -18,13 +18,14 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4 -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat +LOCAL_USE_AAPT2 :=true +LOCAL_STATIC_ANDROID_LIBRARIES += androidx.legacy_legacy-support-v4 +LOCAL_STATIC_ANDROID_LIBRARIES += androidx.appcompat_appcompat LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.appcompat LOCAL_RENDERSCRIPT_TARGET_API := 22 LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src) -LOCAL_SDK_VERSION := 23 +LOCAL_SDK_VERSION := current LOCAL_PACKAGE_NAME := CannyLive diff --git a/tests/java_api/CannyLive/src/com/android/example/cannylive/MainActivity.java b/tests/java_api/CannyLive/src/com/android/example/cannylive/MainActivity.java index 75d8d474..44c773fe 100644 --- a/tests/java_api/CannyLive/src/com/android/example/cannylive/MainActivity.java +++ b/tests/java_api/CannyLive/src/com/android/example/cannylive/MainActivity.java @@ -20,8 +20,8 @@ import android.app.Activity; import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.os.Bundle;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
import android.util.Log;
import android.view.View;
import android.widget.Button;
|