diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-15 14:12:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-15 14:12:17 +0000 |
| commit | 53455cd150feaab90615a66fe3f27c92524bbe82 (patch) | |
| tree | 3a900d89338a81cae9ffde5d0e96235cb40f142d /packages | |
| parent | 0665793932b153a8d5058aae2405fe46179d9f03 (diff) | |
| parent | 2529fdd8af950aa61138752ec52c25a3a4b73817 (diff) | |
Merge changes from topic "b174856119_aosp"
* changes:
Drop prebuilt files to android source tree.
Update CTS shim
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/CtsShim/apk/arm/CtsShim.apk | bin | 5430 -> 5484 bytes | |||
| -rw-r--r-- | packages/CtsShim/apk/arm/CtsShimPriv.apk | bin | 32077 -> 31680 bytes | |||
| -rw-r--r-- | packages/CtsShim/apk/x86/CtsShim.apk | bin | 5430 -> 5484 bytes | |||
| -rw-r--r-- | packages/CtsShim/apk/x86/CtsShimPriv.apk | bin | 24424 -> 24275 bytes | |||
| -rw-r--r-- | packages/CtsShim/build/shim/AndroidManifest.xml | 3 |
5 files changed, 3 insertions, 0 deletions
diff --git a/packages/CtsShim/apk/arm/CtsShim.apk b/packages/CtsShim/apk/arm/CtsShim.apk Binary files differindex 180dfb672c7f..784a74701b4f 100644 --- a/packages/CtsShim/apk/arm/CtsShim.apk +++ b/packages/CtsShim/apk/arm/CtsShim.apk diff --git a/packages/CtsShim/apk/arm/CtsShimPriv.apk b/packages/CtsShim/apk/arm/CtsShimPriv.apk Binary files differindex d87ea7fcef89..5b7bda4d4f84 100644 --- a/packages/CtsShim/apk/arm/CtsShimPriv.apk +++ b/packages/CtsShim/apk/arm/CtsShimPriv.apk diff --git a/packages/CtsShim/apk/x86/CtsShim.apk b/packages/CtsShim/apk/x86/CtsShim.apk Binary files differindex 180dfb672c7f..784a74701b4f 100644 --- a/packages/CtsShim/apk/x86/CtsShim.apk +++ b/packages/CtsShim/apk/x86/CtsShim.apk diff --git a/packages/CtsShim/apk/x86/CtsShimPriv.apk b/packages/CtsShim/apk/x86/CtsShimPriv.apk Binary files differindex 3124651fe425..780cb8a72526 100644 --- a/packages/CtsShim/apk/x86/CtsShimPriv.apk +++ b/packages/CtsShim/apk/x86/CtsShimPriv.apk diff --git a/packages/CtsShim/build/shim/AndroidManifest.xml b/packages/CtsShim/build/shim/AndroidManifest.xml index 3e546f1e02db..58e85220fefe 100644 --- a/packages/CtsShim/build/shim/AndroidManifest.xml +++ b/packages/CtsShim/build/shim/AndroidManifest.xml @@ -52,6 +52,9 @@ </intent-filter> </activity> + <!-- The stub shared library for package visibility test --> + <library android:name="com.android.cts.ctsshim.shared_library" /> + </application> </manifest> |