diff options
| author | Pavel Maltsev <pavelm@google.com> | 2017-02-16 16:55:06 -0800 |
|---|---|---|
| committer | Pavel Maltsev <pavelm@google.com> | 2017-02-16 16:55:06 -0800 |
| commit | d99798219b479c4c1660e47598c55d1c9fc92a2a (patch) | |
| tree | 61a6b71311a242a593487913c9ddca830d9e449f /automotive | |
| parent | 2f16dfed5dc71f51a16ed32a5d79d8ac8d5d7395 (diff) | |
| download | android_hardware_interfaces-d99798219b479c4c1660e47598c55d1c9fc92a2a.tar.gz android_hardware_interfaces-d99798219b479c4c1660e47598c55d1c9fc92a2a.tar.bz2 android_hardware_interfaces-d99798219b479c4c1660e47598c55d1c9fc92a2a.zip | |
Regenerate make files for Vehicle HAL 2.1
Test: m -j32 ; manually verified Car Service is able to connect to HAL
Bug: b/34716856
Change-Id: I544fa67181ef1d5212c6476100728edaa9aa6c7e
Diffstat (limited to 'automotive')
| -rw-r--r-- | automotive/Android.bp | 1 | ||||
| -rw-r--r-- | automotive/vehicle/2.1/Android.bp | 6 | ||||
| -rw-r--r-- | automotive/vehicle/2.1/Android.mk | 4 | ||||
| -rw-r--r-- | automotive/vehicle/Android.bp | 4 |
4 files changed, 4 insertions, 11 deletions
diff --git a/automotive/Android.bp b/automotive/Android.bp index 0302cd578..1f39e8854 100644 --- a/automotive/Android.bp +++ b/automotive/Android.bp @@ -1,6 +1,5 @@ // This is an autogenerated file, do not edit. subdirs = [ - "vehicle", "vehicle/2.0", "vehicle/2.1", ] diff --git a/automotive/vehicle/2.1/Android.bp b/automotive/vehicle/2.1/Android.bp index 12bb4edbd..dcf395c44 100644 --- a/automotive/vehicle/2.1/Android.bp +++ b/automotive/vehicle/2.1/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.automotive.vehicle@2.1", srcs: [ - "types.hal", - "IVehicle.hal", + ":android.hardware.automotive.vehicle@2.1_hal", ], out: [ "android/hardware/automotive/vehicle/2.1/types.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.automotive.vehicle@2.1", srcs: [ - "types.hal", - "IVehicle.hal", + ":android.hardware.automotive.vehicle@2.1_hal", ], out: [ "android/hardware/automotive/vehicle/2.1/types.h", diff --git a/automotive/vehicle/2.1/Android.mk b/automotive/vehicle/2.1/Android.mk index f618268ff..2a8d1dda5 100644 --- a/automotive/vehicle/2.1/Android.mk +++ b/automotive/vehicle/2.1/Android.mk @@ -8,7 +8,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.automotive.vehicle@2.1-java LOCAL_MODULE_CLASS := JAVA_LIBRARIES -intermediates := $(local-generated-sources-dir) +intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) @@ -63,7 +63,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.automotive.vehicle@2.1-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES -intermediates := $(local-generated-sources-dir) +intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) diff --git a/automotive/vehicle/Android.bp b/automotive/vehicle/Android.bp deleted file mode 100644 index c12cd4f92..000000000 --- a/automotive/vehicle/Android.bp +++ /dev/null @@ -1,4 +0,0 @@ -// This is an autogenerated file, do not edit. -subdirs = [ - "2.0", -] |