summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-04-23 14:59:40 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-04-23 14:59:40 +0000
commitf39b81b6d1716f3afde1c9f09e2a794b1de9ab08 (patch)
tree769415210a3bd3ffe1d7a115892e95945078ed23
parent05a23fa34a585e1d79554c5937b1ae25102bf875 (diff)
parent3975cc72798375451704af519ef18ec8998f12ee (diff)
Merge "Update CtsShim whitelist with non-prebuilt names." into rvc-dev
-rw-r--r--apexd/apex_shim.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/apexd/apex_shim.cpp b/apexd/apex_shim.cpp
index 05ca0aa..d1ff90d 100644
--- a/apexd/apex_shim.cpp
+++ b/apexd/apex_shim.cpp
@@ -51,9 +51,9 @@ static constexpr const char* kExpectedCtsShimFiles[] = {
"apex_manifest.json",
"apex_manifest.pb",
"etc/hash.txt",
- "app/CtsShimPrebuilt/CtsShimPrebuilt.apk",
- "app/CtsShimTargetPSdkPrebuilt/CtsShimTargetPSdkPrebuilt.apk",
- "priv-app/CtsShimPrivPrebuilt/CtsShimPrivPrebuilt.apk",
+ "app/CtsShim/CtsShim.apk",
+ "app/CtsShimTargetPSdk/CtsShimTargetPSdk.apk",
+ "priv-app/CtsShimPriv/CtsShimPriv.apk",
};
Result<std::string> CalculateSha512(const std::string& path) {