summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorAndrii Kulian <akulian@google.com>2020-09-08 21:33:26 -0700
committerJeevan Prasath <sivasaj@google.com>2020-09-25 23:26:48 +0000
commit30f9ba0d2be9f70c9055d5818512febceca56b82 (patch)
tree2d476d26593eab915dc4637fe92b89e030f1cdf5 /libs
parent85f5802bec377a36b59efde1ca14be6d00cd52e3 (diff)
Move reference WM Sidecar impl to system_ext
Placing the reference implementation in /vendor partition tirggers UnofficialApisUsageTest failures due to hidden API use in the sample. Moving it to system_ext should resolve this issue. Bug: 167214265 Test: com.android.gts.api.UnofficialApisUsageTest#testNonApiReferences Change-Id: I628fd0e00558208a3af26ecf02b82a3cedad8011 (cherry picked from commit 4ebadc8056532cbc59f8c63068678f1f8f93164c)
Diffstat (limited to 'libs')
-rw-r--r--libs/WindowManager/Jetpack/Android.bp4
-rw-r--r--libs/WindowManager/Jetpack/androidx.window.sidecar.xml2
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>