diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-26 02:11:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-26 02:11:20 +0000 |
| commit | 4c51319e26ef4905e5bd0bca1e06451c324d5f1e (patch) | |
| tree | 9fa5d8dbbeef20499c15b98ae65e71d5bf690cfa /libs | |
| parent | 3176c9090bc3a99575f114a98bc44fdeb4f4ae2e (diff) | |
| parent | 7032e937d4151f24ac959afe992c269c8029e0a4 (diff) | |
Merge "Move reference WM Sidecar impl to system_ext" into rvc-qpr-dev am: 7032e937d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12679304
Change-Id: I48f17dfb8b2295d84de708526dbe5636fd3e94d9
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/WindowManager/Jetpack/Android.bp | 4 | ||||
| -rw-r--r-- | libs/WindowManager/Jetpack/androidx.window.sidecar.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libs/WindowManager/Jetpack/Android.bp b/libs/WindowManager/Jetpack/Android.bp index 4f4364f72fef..7fbbb61e469d 100644 --- a/libs/WindowManager/Jetpack/Android.bp +++ b/libs/WindowManager/Jetpack/Android.bp @@ -24,14 +24,14 @@ java_library { static_libs: ["window-sidecar"], installable: true, sdk_version: "core_platform", - vendor: true, + system_ext_specific: true, libs: ["framework", "androidx.annotation_annotation",], required: ["androidx.window.sidecar.xml",], } prebuilt_etc { name: "androidx.window.sidecar.xml", - vendor: true, + system_ext_specific: true, sub_dir: "permissions", src: "androidx.window.sidecar.xml", filename_from_src: true, diff --git a/libs/WindowManager/Jetpack/androidx.window.sidecar.xml b/libs/WindowManager/Jetpack/androidx.window.sidecar.xml index f88a5f4ae039..359e69fd9bc1 100644 --- a/libs/WindowManager/Jetpack/androidx.window.sidecar.xml +++ b/libs/WindowManager/Jetpack/androidx.window.sidecar.xml @@ -17,5 +17,5 @@ <permissions> <library name="androidx.window.sidecar" - file="/vendor/framework/androidx.window.sidecar.jar"/> + file="/system_ext/framework/androidx.window.sidecar.jar"/> </permissions> |