From 320b5134b5808132133990ddf4fc54f2d094023a Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Fri, 12 May 2017 13:02:04 -0700 Subject: [PATCH] Update makefiles. Note cleanspec required because of b/38205169 (genrule doesn't delete output files before building, so when removing some, they get stale). Test: power vts test compiles Change-Id: Ie7ef0fc3d943a75fe898238cf861fb7f99f4146b Fixes: 35813011 --- CleanSpec.mk | 1 + oemlock/1.0/Android.bp | 4 ++-- power/1.1/Android.bp | 20 ++++++++++++++------ power/1.1/Android.mk | 4 ++-- power/Android.bp | 1 + usb/1.1/Android.bp | 4 ++-- weaver/1.0/Android.bp | 4 ++-- wifi/offload/1.0/Android.bp | 4 ++-- 8 files changed, 26 insertions(+), 16 deletions(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index c55763568f..eeb4198cb6 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -54,3 +54,4 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/hw/android.hardware.bl $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/init/android.hardware.bluetooth*) $(call add-clean-step, rm -rf $(OUT)/soong/.intermediates/) $(call add-clean-step, rm -rf $(OUT_DIR)/soong/.intermediates/hardware/interfaces/) +$(call add-clean-step, rm -rf $(OUT_DIR)/soong/.intermediates/hardware/interfaces/) diff --git a/oemlock/1.0/Android.bp b/oemlock/1.0/Android.bp index 355b42d7b4..dc6581eee1 100644 --- a/oemlock/1.0/Android.bp +++ b/oemlock/1.0/Android.bp @@ -11,7 +11,7 @@ filegroup { genrule { name: "android.hardware.oemlock@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.oemlock@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.oemlock@1.0", srcs: [ ":android.hardware.oemlock@1.0_hal", ], @@ -24,7 +24,7 @@ genrule { genrule { name: "android.hardware.oemlock@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.oemlock@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.oemlock@1.0", srcs: [ ":android.hardware.oemlock@1.0_hal", ], diff --git a/power/1.1/Android.bp b/power/1.1/Android.bp index ab129ff3f9..ee50a18011 100644 --- a/power/1.1/Android.bp +++ b/power/1.1/Android.bp @@ -1,12 +1,19 @@ // This file is autogenerated by hidl-gen. Do not edit manually. +filegroup { + name: "android.hardware.power@1.1_hal", + srcs: [ + "types.hal", + "IPower.hal", + ], +} + genrule { name: "android.hardware.power@1.1_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.1", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.1", srcs: [ - "types.hal", - "IPower.hal", + ":android.hardware.power@1.1_hal", ], out: [ "android/hardware/power/1.1/types.cpp", @@ -17,13 +24,13 @@ genrule { genrule { name: "android.hardware.power@1.1_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.1", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.1", srcs: [ - "types.hal", - "IPower.hal", + ":android.hardware.power@1.1_hal", ], out: [ "android/hardware/power/1.1/types.h", + "android/hardware/power/1.1/hwtypes.h", "android/hardware/power/1.1/IPower.h", "android/hardware/power/1.1/IHwPower.h", "android/hardware/power/1.1/BnHwPower.h", @@ -37,6 +44,7 @@ cc_library_shared { generated_sources: ["android.hardware.power@1.1_genc++"], generated_headers: ["android.hardware.power@1.1_genc++_headers"], export_generated_headers: ["android.hardware.power@1.1_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/power/1.1/Android.mk b/power/1.1/Android.mk index 77c55253a1..16cfcbd4f2 100644 --- a/power/1.1/Android.mk +++ b/power/1.1/Android.mk @@ -8,7 +8,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.power-V1.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) @@ -84,7 +84,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.power-V1.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/power/Android.bp b/power/Android.bp index 8cb3ea31c8..7a315faab3 100644 --- a/power/Android.bp +++ b/power/Android.bp @@ -2,6 +2,7 @@ subdirs = [ "1.0", "1.0/default", + "1.0/vts/functional", "1.1", "1.1/default", "1.1/vts/functional", diff --git a/usb/1.1/Android.bp b/usb/1.1/Android.bp index 7342d003b9..d5cdf04e85 100644 --- a/usb/1.1/Android.bp +++ b/usb/1.1/Android.bp @@ -12,7 +12,7 @@ filegroup { genrule { name: "android.hardware.usb@1.1_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.1", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.1", srcs: [ ":android.hardware.usb@1.1_hal", ], @@ -26,7 +26,7 @@ genrule { genrule { name: "android.hardware.usb@1.1_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.1", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.1", srcs: [ ":android.hardware.usb@1.1_hal", ], diff --git a/weaver/1.0/Android.bp b/weaver/1.0/Android.bp index f9c256fb30..8d6c1d1f20 100644 --- a/weaver/1.0/Android.bp +++ b/weaver/1.0/Android.bp @@ -11,7 +11,7 @@ filegroup { genrule { name: "android.hardware.weaver@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.weaver@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.weaver@1.0", srcs: [ ":android.hardware.weaver@1.0_hal", ], @@ -24,7 +24,7 @@ genrule { genrule { name: "android.hardware.weaver@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.weaver@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.weaver@1.0", srcs: [ ":android.hardware.weaver@1.0_hal", ], diff --git a/wifi/offload/1.0/Android.bp b/wifi/offload/1.0/Android.bp index 7b1b050311..63f85a6b13 100644 --- a/wifi/offload/1.0/Android.bp +++ b/wifi/offload/1.0/Android.bp @@ -12,7 +12,7 @@ filegroup { genrule { name: "android.hardware.wifi.offload@1.0_genc++", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.offload@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.offload@1.0", srcs: [ ":android.hardware.wifi.offload@1.0_hal", ], @@ -26,7 +26,7 @@ genrule { genrule { name: "android.hardware.wifi.offload@1.0_genc++_headers", tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.offload@1.0", + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.offload@1.0", srcs: [ ":android.hardware.wifi.offload@1.0_hal", ],