| commit | 3503c0e9e7e5240d8413c0221584883d9f68d8f5 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Jun 09 11:27:30 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 09 11:27:30 2020 +0000 |
| tree | 68a48a1a466eb542ccf6157efa0e722a4075e24b | |
| parent | ab7dfe04a029429370b8d19c382484e2cee73706 [diff] | |
| parent | e0be4c35eccd491bbfe255063deb0fbf1573d481 [diff] |
Merge "Use APK CtsShim prebuilts for flattened apex." into rvc-dev am: e0be4c35ec Original change: https://googleplex-android-review.googlesource.com/c/platform/system/apex/+/11734282 Change-Id: I87f0f5cb6f399eb2c5fdc64dd35837167fd7adb2
diff --git a/shim/Android.bp b/shim/Android.bp index 9e4b028..351e754 100644 --- a/shim/Android.bp +++ b/shim/Android.bp
@@ -17,7 +17,7 @@ prebuilt_apex { name: "com.android.apex.cts.shim.v1_prebuilt", - overrides: ["com.android.apex.cts.shim.v1"], + overrides: ["CtsShimPrebuilt", "CtsShimPrivPrebuilt"], arch: { arm: { src: "prebuilts/arm/com.android.apex.cts.shim.v1.apex",