commit 00a811f1ba444917ddb2f08b1af68e91701864b9
author Motomu Utsumi <motomuman@google.com> Fri Jan 27 15:37:14 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 27 15:37:14 2023 +0000
tree e38ba9c5cac1d6f0576ff25ad826afb020b1ecc1
parent 1908c037eb14e2ddd5a23f8eb110a4698899d306
parent 19357d7b158a33086209b4b8bcfb074c1e591998

gn2bp: Update desc jsons and Android.bp.swp am: c5633ead12 am: 19357d7b15

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

Change-Id: Ia346f779048660919e222e4fb05f761bd14c23d4
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 c163404..6ba7f93 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -1400,7 +1400,7 @@
 cc_genrule {
     name: "cronet_aml_base_build_date",
     cmd: "$(location build/write_build_date_header.py) $(out) " +
-         "1670872261",
+         "1674804594",
     out: [
         "base/generated_build_date.h",
     ],
@@ -2817,7 +2817,6 @@
         "net/android/java/src/org/chromium/net/RegistrationPolicyApplicationStatus.java",
         "net/android/java/src/org/chromium/net/ThreadStatsUid.java",
         "net/android/java/src/org/chromium/net/X509Util.java",
-        "third_party/android_deps/local_modifications/preconditions/java/androidx/core/util/Preconditions.java",
         "url/android/java/src/org/chromium/url/IDNStringUtil.java",
     ],
     cmd: "current_dir=`basename \\`pwd\\``; " +
@@ -3071,7 +3070,6 @@
         "net/android/java/src/org/chromium/net/RegistrationPolicyApplicationStatus.java",
         "net/android/java/src/org/chromium/net/ThreadStatsUid.java",
         "net/android/java/src/org/chromium/net/X509Util.java",
-        "third_party/android_deps/local_modifications/preconditions/java/androidx/core/util/Preconditions.java",
         "url/android/java/src/org/chromium/url/IDNStringUtil.java",
     ],
     cmd: "current_dir=`basename \\`pwd\\``; " +
@@ -4263,7 +4261,6 @@
         "net/android/java/src/org/chromium/net/RegistrationPolicyApplicationStatus.java",
         "net/android/java/src/org/chromium/net/ThreadStatsUid.java",
         "net/android/java/src/org/chromium/net/X509Util.java",
-        "third_party/android_deps/local_modifications/preconditions/java/androidx/core/util/Preconditions.java",
         "url/android/java/src/org/chromium/url/IDNStringUtil.java",
     ],
     static_libs: [

tools/gn2bp/desc_arm.json

diff --git a/tools/gn2bp/desc_arm.json b/tools/gn2bp/desc_arm.json
index f6b7299..ff1a7e2 100644
--- a/tools/gn2bp/desc_arm.json
+++ b/tools/gn2bp/desc_arm.json
Binary files differ

tools/gn2bp/desc_arm64.json

diff --git a/tools/gn2bp/desc_arm64.json b/tools/gn2bp/desc_arm64.json
index 5ce367c..20c942f 100644
--- a/tools/gn2bp/desc_arm64.json
+++ b/tools/gn2bp/desc_arm64.json
Binary files differ

tools/gn2bp/desc_x64.json

diff --git a/tools/gn2bp/desc_x64.json b/tools/gn2bp/desc_x64.json
index d0292d1..b25932b 100644
--- a/tools/gn2bp/desc_x64.json
+++ b/tools/gn2bp/desc_x64.json
Binary files differ

tools/gn2bp/desc_x86.json

diff --git a/tools/gn2bp/desc_x86.json b/tools/gn2bp/desc_x86.json
index 77a77d6..b4bc6e9 100644
--- a/tools/gn2bp/desc_x86.json
+++ b/tools/gn2bp/desc_x86.json
Binary files differ