Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 320b5134 authored by Steven Moreland's avatar Steven Moreland
Browse files

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
parent ebce2c38

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -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/)

oemlock/1.0/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -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",

    ],

power/1.1/Android.bp

+14 −6
Original line number Diff line number Diff line 
// 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",

power/1.1/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -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)

power/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
subdirs = [

    "1.0",

    "1.0/default",

    "1.0/vts/functional",

    "1.1",

    "1.1/default",

    "1.1/vts/functional",