Convert DumpViewer to Android.bp
Test: make DumpViewer
Change-Id: I0f2fe63a3742888978cebd5bb9947d37291c5545
Merged-In: I0f2fe63a3742888978cebd5bb9947d37291c5545
(cherry picked from commit 57eeb31650588b47bfe27c097ea3b22409956a72)
diff --git a/apps/DumpViewer/Android.mk b/apps/DumpViewer/Android.mk
deleted file mode 100644
index fafec33..0000000
--- a/apps/DumpViewer/Android.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(LOCAL_PATH)/app/src/main/Android.mk
diff --git a/apps/DumpViewer/app/src/main/Android.bp b/apps/DumpViewer/app/src/main/Android.bp
new file mode 100644
index 0000000..a67de47
--- /dev/null
+++ b/apps/DumpViewer/app/src/main/Android.bp
@@ -0,0 +1,28 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test {
+ name: "DumpViewer",
+
+ srcs: ["**/*.java"],
+
+ static_libs: [
+ "androidx.annotation_annotation",
+ "androidx.collection_collection",
+ "androidx.arch.core_core-common",
+ "androidx.lifecycle_lifecycle-common",
+ "androidx.lifecycle_lifecycle-runtime",
+ "androidx.percentlayout_percentlayout",
+ "androidx.transition_transition",
+ "androidx.core_core",
+ "androidx.legacy_legacy-support-core-ui",
+ "androidx.media_media",
+ "androidx.legacy_legacy-support-v13",
+ "androidx.preference_preference",
+ "androidx.appcompat_appcompat",
+ "androidx.gridlayout_gridlayout",
+ "androidx.recyclerview_recyclerview",
+ ],
+ sdk_version: "31",
+}
diff --git a/apps/DumpViewer/app/src/main/Android.mk b/apps/DumpViewer/app/src/main/Android.mk
deleted file mode 100644
index 92c0c29..0000000
--- a/apps/DumpViewer/app/src/main/Android.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
- androidx.annotation_annotation \
- androidx.collection_collection \
- androidx.arch.core_core-common \
- androidx.lifecycle_lifecycle-common \
-
-LOCAL_STATIC_ANDROID_LIBRARIES := \
- androidx.lifecycle_lifecycle-runtime \
- androidx.percentlayout_percentlayout \
- androidx.transition_transition \
- androidx.core_core \
- androidx.legacy_legacy-support-core-ui \
- androidx.media_media \
- androidx.legacy_legacy-support-v13 \
- androidx.preference_preference \
- androidx.appcompat_appcompat \
- androidx.gridlayout_gridlayout \
- androidx.recyclerview_recyclerview
-
-LOCAL_PACKAGE_NAME := DumpViewer
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_SDK_VERSION := 26
-
-include $(BUILD_PACKAGE)
