Merge "Convert packages/Shell/**/Android.mk file to Android.bp"

4 files changed, 33 insertions, 51 deletions

diff --git a/packages/Shell/Android.bp b/packages/Shell/Android.bp
new file mode 100644
index 000000000000..aaaf0448fc31
--- /dev/null
+++ b/packages/Shell/Android.bp
@@ -0,0 +1,14 @@
+android_app {
+    name: "Shell",
+    srcs: ["src/**/*.java",":dumpstate_aidl"],
+    aidl: {
+        include_dirs: ["frameworks/native/cmds/dumpstate/binder"],
+    },
+    static_libs: ["androidx.legacy_legacy-support-v4"],
+    platform_apis: true,
+    certificate: "platform",
+    privileged: true,
+    jacoco: {
+        include_filter: ["com.android.shell.*"],
+    },
+}
diff --git a/packages/Shell/Android.mk b/packages/Shell/Android.mk
deleted file mode 100644
index b738d7771465..000000000000
--- a/packages/Shell/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_SRC_FILES += \
-        ../../../native/cmds/dumpstate/binder/android/os/IDumpstate.aidl \
-        ../../../native/cmds/dumpstate/binder/android/os/IDumpstateListener.aidl \
-        ../../../native/cmds/dumpstate/binder/android/os/IDumpstateToken.aidl
-
-LOCAL_AIDL_INCLUDES = frameworks/native/cmds/dumpstate/binder
-
-LOCAL_STATIC_ANDROID_LIBRARIES := androidx.legacy_legacy-support-v4
-LOCAL_USE_AAPT2 := true
-
-LOCAL_PACKAGE_NAME := Shell
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := true
-
-LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.shell.*
-
-include $(BUILD_PACKAGE)
-
-include $(LOCAL_PATH)/tests/Android.mk
diff --git a/packages/Shell/tests/Android.bp b/packages/Shell/tests/Android.bp
new file mode 100644
index 000000000000..8536c4fbb5a3
--- /dev/null
+++ b/packages/Shell/tests/Android.bp
@@ -0,0 +1,19 @@
+android_test {
+    name: "ShellTests",
+    srcs: ["src/**/*.java"],
+    libs: [
+        "android.test.runner",
+        "android.test.base",
+        "android.test.mock",
+    ],
+    static_libs: [
+        "androidx.test.rules",
+        "mockito-target-minus-junit4",
+        "ub-uiautomator",
+        "junit",
+    ],
+    platform_apis: true,
+    test_suites: ["device-tests"],
+    instrumentation_for: "Shell",
+    certificate: "platform",
+}
diff --git a/packages/Shell/tests/Android.mk b/packages/Shell/tests/Android.mk
deleted file mode 100644
index 44ff3383d566..000000000000
--- a/packages/Shell/tests/Android.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base android.test.mock
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    androidx.test.rules \
-    mockito-target-minus-junit4 \
-    ub-uiautomator \
-    junit \
-
-LOCAL_PACKAGE_NAME := ShellTests
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_COMPATIBILITY_SUITE := device-tests
-LOCAL_INSTRUMENTATION_FOR := Shell
-
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)