diff options
| author | Xin Li <delphij@google.com> | 2020-12-02 00:38:58 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2020-12-02 00:38:58 -0800 |
| commit | d31ee388115d17c2fd337f2806b37390c7d29834 (patch) | |
| tree | de02b2ac289fbc2077fbc652481672eeea0b18fe /libs | |
| parent | 88f10e63bb2ce069bffc195acee09c332aab71fd (diff) | |
| parent | 07ec9b4dcb828de0f9ad15ef5c501fcc5ce21379 (diff) | |
Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855
Bug: 172690556
Merged-In: I78222391b83a4add8e964340ec08bb8a1306e1c6
Change-Id: I28bbf40820674675ccf765c912aa8140d3f74ab2
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> |