commit 644ff81ea4a8569a1bb6dcf967ba5dda6e1805e2
author Xianyuan Jia <xianyuanjia@google.com> Wed Mar 29 00:45:36 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 29 00:45:36 2023 +0000
tree d63d227a79262dfe0b5f7607c66e9bce72bd1159
parent 9a5aa73b45f1679c317d26ef9dc65a1f9f16648e
parent 1662d7e8212bb7cc75459ed8b95f256b6be3963c

Fix ClassNotFoundError in mobly-bundled-snippets am: 5f92eab329 am: 53ff8b86ca am: ef761f7eda am: 1662d7e821

Original change: https://android-review.googlesource.com/c/platform/external/mobly-bundled-snippets/+/2509786

Change-Id: Idba8b78731727cbcb1eec69d2f5421c62165dd75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index ad7cbe8..6895247 100644
--- a/Android.bp
+++ b/Android.bp
@@ -16,7 +16,7 @@
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-android_app {
+android_test {
     name: "mobly-bundled-snippets",
     static_libs: [
         "androidx.test.runner",

src/main/AndroidManifest.xml

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 21de6d7..795c063 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -29,8 +29,7 @@
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
     <uses-permission android:name="android.permission.SEND_SMS" />
-    <application android:allowBackup="false"
-                 android:name="androidx.multidex.MultiDexApplication">
+    <application>
         <meta-data
             android:name="mobly-snippets"
             android:value="com.google.android.mobly.snippet.bundled.AccountSnippet,