summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorTri Vo <trong@google.com>2017-02-10 12:45:17 -0800
committerTri Vo <trong@google.com>2017-02-10 12:45:19 -0800
commit85120c9490dfc53421a0eeee648acf65ac96cefb (patch)
treeb548bd2c4a4b9106c5c4816fe68e2aaa16f64e03 /camera
parent57108a0dc99287319febbd13add67c35ee05e494 (diff)
downloadandroid_hardware_interfaces-85120c9490dfc53421a0eeee648acf65ac96cefb.tar.gz
android_hardware_interfaces-85120c9490dfc53421a0eeee648acf65ac96cefb.tar.bz2
android_hardware_interfaces-85120c9490dfc53421a0eeee648acf65ac96cefb.zip
Update makefiles to use filgroup syntax.
Test: mmma hardware/interfaces Change-Id: I9f4457c78b7820c242d46359f0debe05d1b3e482
Diffstat (limited to 'camera')
-rw-r--r--camera/common/1.0/Android.bp4
-rw-r--r--camera/device/1.0/Android.bp10
-rw-r--r--camera/device/3.2/Android.bp10
-rw-r--r--camera/metadata/3.2/Android.bp4
-rw-r--r--camera/provider/2.4/Android.bp6
5 files changed, 10 insertions, 24 deletions
diff --git a/camera/common/1.0/Android.bp b/camera/common/1.0/Android.bp
index 9717963d5..aea6e7636 100644
--- a/camera/common/1.0/Android.bp
+++ b/camera/common/1.0/Android.bp
@@ -12,7 +12,7 @@ genrule {
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.common@1.0",
srcs: [
- "types.hal",
+ ":android.hardware.camera.common@1.0_hal",
],
out: [
"android/hardware/camera/common/1.0/types.cpp",
@@ -24,7 +24,7 @@ genrule {
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.common@1.0",
srcs: [
- "types.hal",
+ ":android.hardware.camera.common@1.0_hal",
],
out: [
"android/hardware/camera/common/1.0/types.h",
diff --git a/camera/device/1.0/Android.bp b/camera/device/1.0/Android.bp
index b285ee0dd..b8560c777 100644
--- a/camera/device/1.0/Android.bp
+++ b/camera/device/1.0/Android.bp
@@ -15,10 +15,7 @@ genrule {
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@1.0",
srcs: [
- "types.hal",
- "ICameraDevice.hal",
- "ICameraDeviceCallback.hal",
- "ICameraDevicePreviewCallback.hal",
+ ":android.hardware.camera.device@1.0_hal",
],
out: [
"android/hardware/camera/device/1.0/types.cpp",
@@ -33,10 +30,7 @@ genrule {
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@1.0",
srcs: [
- "types.hal",
- "ICameraDevice.hal",
- "ICameraDeviceCallback.hal",
- "ICameraDevicePreviewCallback.hal",
+ ":android.hardware.camera.device@1.0_hal",
],
out: [
"android/hardware/camera/device/1.0/types.h",
diff --git a/camera/device/3.2/Android.bp b/camera/device/3.2/Android.bp
index 1bc11ed48..a3ac721c3 100644
--- a/camera/device/3.2/Android.bp
+++ b/camera/device/3.2/Android.bp
@@ -15,10 +15,7 @@ genrule {
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.2",
srcs: [
- "types.hal",
- "ICameraDevice.hal",
- "ICameraDeviceCallback.hal",
- "ICameraDeviceSession.hal",
+ ":android.hardware.camera.device@3.2_hal",
],
out: [
"android/hardware/camera/device/3.2/types.cpp",
@@ -33,10 +30,7 @@ genrule {
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.2",
srcs: [
- "types.hal",
- "ICameraDevice.hal",
- "ICameraDeviceCallback.hal",
- "ICameraDeviceSession.hal",
+ ":android.hardware.camera.device@3.2_hal",
],
out: [
"android/hardware/camera/device/3.2/types.h",
diff --git a/camera/metadata/3.2/Android.bp b/camera/metadata/3.2/Android.bp
index fa319e92b..1e464d61c 100644
--- a/camera/metadata/3.2/Android.bp
+++ b/camera/metadata/3.2/Android.bp
@@ -12,7 +12,7 @@ genrule {
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.metadata@3.2",
srcs: [
- "types.hal",
+ ":android.hardware.camera.metadata@3.2_hal",
],
out: [
"android/hardware/camera/metadata/3.2/types.cpp",
@@ -24,7 +24,7 @@ genrule {
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.metadata@3.2",
srcs: [
- "types.hal",
+ ":android.hardware.camera.metadata@3.2_hal",
],
out: [
"android/hardware/camera/metadata/3.2/types.h",
diff --git a/camera/provider/2.4/Android.bp b/camera/provider/2.4/Android.bp
index 1874cd5c2..3369a3c78 100644
--- a/camera/provider/2.4/Android.bp
+++ b/camera/provider/2.4/Android.bp
@@ -13,8 +13,7 @@ genrule {
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.provider@2.4",
srcs: [
- "ICameraProvider.hal",
- "ICameraProviderCallback.hal",
+ ":android.hardware.camera.provider@2.4_hal",
],
out: [
"android/hardware/camera/provider/2.4/CameraProviderAll.cpp",
@@ -27,8 +26,7 @@ genrule {
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.provider@2.4",
srcs: [
- "ICameraProvider.hal",
- "ICameraProviderCallback.hal",
+ ":android.hardware.camera.provider@2.4_hal",
],
out: [
"android/hardware/camera/provider/2.4/ICameraProvider.h",