commit e27135ff9c9474a37608601f7de6cf166181e5c8
author Motomu Utsumi <motomuman@google.com> Mon Dec 12 03:48:55 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Dec 12 03:48:55 2022 +0000
tree 0ec3b39852b6d9ffc68f57a93106f44a29730471
parent 9e845ded25f0641eeccfe5335862c702e56edbfe
parent 05a49a585543d526a90f5d5c7668d2065fceaeab

gn2bp: Update libs to stop soong complaining am: 05a49a5855

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2337404

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

tools/gn2bp/Android.bp.swp

diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index bbd0017..0b0ad9e 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -9855,8 +9855,9 @@
     libs: [
         "android-support-multidex",
         "androidx.annotation_annotation",
+        "androidx.annotation_annotation-experimental-nodeps",
         "androidx.collection_collection",
-        "androidx.core_core",
+        "androidx.core_core-nodeps",
         "framework-connectivity-t.stubs.module_lib",
         "framework-connectivity.stubs.module_lib",
         "framework-mediaprovider.stubs.module_lib",

tools/gn2bp/gen_android_bp

diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index b5d47d7..46918c6 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -1340,8 +1340,9 @@
   module.libs = {
     "androidx.annotation_annotation",
     "jsr305",
-    "androidx.core_core",
+    "androidx.core_core-nodeps",
     "androidx.collection_collection",
+    "androidx.annotation_annotation-experimental-nodeps",
     "android-support-multidex",
     "framework-connectivity.stubs.module_lib",
     "framework-connectivity-t.stubs.module_lib",