aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Krahn <dkrahn@google.com>2023-12-12 18:44:42 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-12-12 18:44:42 +0000
commitf67304b15f47228542a107e5b5e37ae97d93c146 (patch)
tree729e804cae7a379c775ab8443dd99c47b4091016
parent9f53603ddbedf6b692edec4ba07e656a6e4c93d8 (diff)
parent08081593de7bfce42af1d673caf04cd323c77ec4 (diff)
downloadupdate_engine-f67304b15f47228542a107e5b5e37ae97d93c146.tar.gz
Remove dependency on cacerts_google am: 03c7be5f60 am: 90d819164b am: 08081593de
Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/2855932 Change-Id: Ie95a6298fa90bda895a654058a65bb506d5a3c17 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--aosp/platform_constants_android.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index 610e7baa..6d9b14b0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -556,7 +556,7 @@ cc_binary {
"libgflags",
],
required: [
- "cacerts_google",
+ "cacerts",
"otacerts",
],
diff --git a/aosp/platform_constants_android.cc b/aosp/platform_constants_android.cc
index a0a2a5ec..1209cee3 100644
--- a/aosp/platform_constants_android.cc
+++ b/aosp/platform_constants_android.cc
@@ -27,7 +27,7 @@ const char kOmahaUpdaterID[] = "Brillo";
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";