From 30f9ba0d2be9f70c9055d5818512febceca56b82 Mon Sep 17 00:00:00 2001
From: Andrii Kulian <akulian@google.com>
Date: Tue, 8 Sep 2020 21:33:26 -0700
Subject: 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)
---
 libs/WindowManager/Jetpack/Android.bp                  | 4 ++--
 libs/WindowManager/Jetpack/androidx.window.sidecar.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'libs')

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>
-- 
cgit v1.2.3