| commit | 1f2fa98f6a3c63869f56b7b59086b2aca1c1b486 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Feb 10 17:03:37 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 10 17:03:37 2023 +0000 |
| tree | bb05a5129c3456d8c0180c6514f6e5dad972d8f1 | |
| parent | afc69c647178e1156d2fd3f657e97185c85f85ef [diff] | |
| parent | ae785857d8167d6687982720f79dc23ef8942662 [diff] |
Merge "gn2bp: Add `use_nss_certs = false` to gen_desc_json" am: e3e84d0fc3 am: ae785857d8 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2428880 Change-Id: I72d91843b24a79dd31cc5a8ddf74b1d030dd87b9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tools/gn2bp/desc_arm.json b/tools/gn2bp/desc_arm.json index f30db26..d6046b5 100644 --- a/tools/gn2bp/desc_arm.json +++ b/tools/gn2bp/desc_arm.json Binary files differ
diff --git a/tools/gn2bp/desc_arm64.json b/tools/gn2bp/desc_arm64.json index 9d220fb..8b1fd14 100644 --- a/tools/gn2bp/desc_arm64.json +++ b/tools/gn2bp/desc_arm64.json Binary files differ
diff --git a/tools/gn2bp/desc_x64.json b/tools/gn2bp/desc_x64.json index 8036bdf..9abf569 100644 --- a/tools/gn2bp/desc_x64.json +++ b/tools/gn2bp/desc_x64.json Binary files differ
diff --git a/tools/gn2bp/desc_x86.json b/tools/gn2bp/desc_x86.json index 32bea54..5e989de 100644 --- a/tools/gn2bp/desc_x86.json +++ b/tools/gn2bp/desc_x86.json Binary files differ
diff --git a/tools/gn2bp/gen_desc_json.sh b/tools/gn2bp/gen_desc_json.sh index 1f60eb9..0bd99a9 100755 --- a/tools/gn2bp/gen_desc_json.sh +++ b/tools/gn2bp/gen_desc_json.sh
@@ -56,6 +56,7 @@ "is_cronet_build = true" "is_debug = false" "is_official_build = true" + "use_nss_certs = false" ) gn_args+=("target_cpu = \"${1}\"")