summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmilian Peev <epeev@google.com>2021-05-10 17:44:58 -0700
committerEmilian Peev <epeev@google.com>2021-05-10 17:44:58 -0700
commitab089868eb7f9a0ce8539abd8f4674ada107ef1e (patch)
treeb02db3aa52d728dc2ea48b0d51474051f03f5237
parent874fc716738bfa90ae22c1e8c70a9e560153c030 (diff)
downloadex-ab089868eb7f9a0ce8539abd8f4674ada107ef1e.tar.gz
Camera: Move extension sample from product to vendor
GSI builds need to erase and flash vanilla AOSP product partition which will remove the sample extension implementation library. Continue running all extension tests in case of GSI builds and move the sample library to the vendor partition. Bug: 187143095 Test: Successful build Change-Id: I22443e743c232a3c25414d7972095043ee8ef786
-rw-r--r--camera2/extensions/sample/Android.bp4
-rw-r--r--camera2/extensions/sample/camera_extensions.xml2
2 files changed, 3 insertions, 3 deletions
diff --git a/camera2/extensions/sample/Android.bp b/camera2/extensions/sample/Android.bp
index 20607f5c..70291751 100644
--- a/camera2/extensions/sample/Android.bp
+++ b/camera2/extensions/sample/Android.bp
@@ -23,12 +23,12 @@ java_library {
srcs: ["src/**/*.java"],
sdk_version: "current",
- product_specific: true,
+ vendor: true,
}
prebuilt_etc {
name: "sample_camera_extensions.xml",
src: "camera_extensions.xml",
sub_dir: "permissions",
- product_specific: true,
+ vendor: true,
}
diff --git a/camera2/extensions/sample/camera_extensions.xml b/camera2/extensions/sample/camera_extensions.xml
index 9b675932..3f8c6378 100644
--- a/camera2/extensions/sample/camera_extensions.xml
+++ b/camera2/extensions/sample/camera_extensions.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<permissions>
<library name="androidx.camera.extensions.impl"
- file="/product/framework/androidx.camera.extensions.impl.jar"/>
+ file="/vendor/framework/androidx.camera.extensions.impl.jar"/>
</permissions>