commit 03c7be5f6096f19784af13d275f4f13f88fd4dd0
author Darren Krahn <dkrahn@google.com> Thu Nov 30 15:40:12 2023 -0800
committer Darren Krahn <dkrahn@google.com> Tue Dec 12 17:05:46 2023 +0000
tree 729e804cae7a379c775ab8443dd99c47b4091016
parent 89e5b6c0432bba1519798545b6249fc982eb1d11

Remove dependency on cacerts_google

This set of root certs is unmaintained and is being cleaned up. Changed
to use the default root certs instead.

Test: presubmit
Bug: none
Change-Id: I2b6b461eae45fcf85856e708ff0f2a599e877b61

Android.bp

diff --git a/Android.bp b/Android.bp
index 610e7ba..6d9b14b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -556,7 +556,7 @@
         "libgflags",
     ],
     required: [
-        "cacerts_google",
+        "cacerts",
         "otacerts",
     ],
 

aosp/platform_constants_android.cc

diff --git a/aosp/platform_constants_android.cc b/aosp/platform_constants_android.cc
index a0a2a5e..1209cee 100644
--- a/aosp/platform_constants_android.cc
+++ b/aosp/platform_constants_android.cc
@@ -27,7 +27,7 @@
 const char kOmahaPlatformName[] = "Brillo";
 const char kUpdatePayloadPublicKeyPath[] = "";
 const char kUpdateCertificatesPath[] = "/system/etc/security/otacerts.zip";
-const char kCACertificatesPath[] = "/system/etc/security/cacerts_google";
+const char kCACertificatesPath[] = "/system/etc/security/cacerts";
 // No deadline file API support on Android.
 const char kOmahaResponseDeadlineFile[] = "";
 const char kNonVolatileDirectory[] = "/data/misc/update_engine";