Merge "Convert IntentPlayground/Android.mk to Android.bp" am: e281d79cff

Original change: https://android-review.googlesource.com/c/platform/development/+/1691912

Change-Id: I4ad58285353922b3ff13157a13334c6b2ed18ad9

samples/IntentPlayground/Android.bp

@@ -0,0 +1,19 @@
+package {
+    // See: http://go/android-license-faq
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test {
+    name: "IntentPlayground",
+    // Only compile source java files in this apk.
+    srcs: ["src/**/*.java"],
+    resource_dirs: ["res"],
+    static_libs: [
+        "com.google.android.material_material",
+        "androidx.appcompat_appcompat",
+        "androidx.recyclerview_recyclerview",
+        "androidx.lifecycle_lifecycle-livedata",
+        "androidx.lifecycle_lifecycle-viewmodel",
+    ],
+    sdk_version: "current",
+}

samples/IntentPlayground/Android.mk

@@ -1,30 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := samples tests
-
-# Only compile source java files in this apk.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_STATIC_ANDROID_LIBRARIES := \
-    com.google.android.material_material \
-    androidx.appcompat_appcompat \
-    androidx.recyclerview_recyclerview \
-    androidx.lifecycle_lifecycle-livedata \
-    androidx.lifecycle_lifecycle-viewmodel
-
-LOCAL_USE_AAPT2 := true
-
-LOCAL_PACKAGE_NAME := IntentPlayground
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-
-LOCAL_SDK_VERSION := current
-
-
-include $(BUILD_PACKAGE)
-
-# Use the following include to make our test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))