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

Commit 242b34ed authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Convert to Android.bp 

See build/soong/README.md for more information.

Bug: 31742855
Test: mma -j
Change-Id: Icb93f3b1b2caeb5e9c00f88ca35841b927ad075d
parent fe2b0983

Android.bp

0 → 100644
+14 −0
Original line number Diff line number Diff line 
subdirs = [

    "benchmarks/msgq/1.0",

    "nfc/1.0",

    "nfc/1.0/default",

    "tests/bar/1.0",

    "tests/baz/1.0",

    "tests/expression/1.0",

    "tests/foo/1.0",

    "tests/libhwbinder/1.0",

    "tests/msgq/1.0",

    "tests/pointer/1.0",

    "wifi/1.0",

    "wifi/supplicant/1.0",

]

benchmarks/msgq/1.0/Android.bp

0 → 100644
+42 −0
Original line number Diff line number Diff line 
// This file is autogenerated by hidl-gen. Do not edit manually.



genrule {

    name: "android.hardware.benchmarks.msgq@1.0_genc++",

    tool: "hidl-gen",

    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.benchmarks.msgq@1.0",

    srcs: [

        "IBenchmarkMsgQ.hal",

    ],

    out: [

        "android/hardware/benchmarks/msgq/1.0/BenchmarkMsgQAll.cpp",

    ],

}



genrule {

    name: "android.hardware.benchmarks.msgq@1.0_genc++_headers",

    tool: "hidl-gen",

    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.benchmarks.msgq@1.0",

    srcs: [

        "IBenchmarkMsgQ.hal",

    ],

    out: [

        "android/hardware/benchmarks/msgq/1.0/IBenchmarkMsgQ.h",

        "android/hardware/benchmarks/msgq/1.0/IHwBenchmarkMsgQ.h",

        "android/hardware/benchmarks/msgq/1.0/BnBenchmarkMsgQ.h",

        "android/hardware/benchmarks/msgq/1.0/BpBenchmarkMsgQ.h",

        "android/hardware/benchmarks/msgq/1.0/BsBenchmarkMsgQ.h",

    ],

}



cc_library_shared {

    name: "android.hardware.benchmarks.msgq@1.0",

    generated_sources: ["android.hardware.benchmarks.msgq@1.0_genc++"],

    generated_headers: ["android.hardware.benchmarks.msgq@1.0_genc++_headers"],

    export_generated_headers: ["android.hardware.benchmarks.msgq@1.0_genc++_headers"],

    shared_libs: [

        "libhidl",

        "libhwbinder",

        "libutils",

        "libcutils",

    ],

}

benchmarks/msgq/1.0/Android.mk

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)



LOCAL_MODULE := android.hardware.benchmarks.msgq@1.0

LOCAL_MODULE_CLASS := SHARED_LIBRARIES



intermediates := $(local-generated-sources-dir)



HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)



#

# Build IBenchmarkMsgQ.hal

#

GEN := $(intermediates)/android/hardware/benchmarks/msgq/1.0/BenchmarkMsgQAll.cpp

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBenchmarkMsgQ.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Lc++ -randroid.hardware:hardware/interfaces \

        android.hardware.benchmarks.msgq@1.0::IBenchmarkMsgQ



$(GEN): $(LOCAL_PATH)/IBenchmarkMsgQ.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)

LOCAL_SHARED_LIBRARIES := \

    libhidl \

    libhwbinder \

    libutils \

    libcutils \



LOCAL_MULTILIB := both

include $(BUILD_SHARED_LIBRARY)





include $(call all-makefiles-under,$(LOCAL_PATH))

nfc/1.0/Android.bp

0 → 100644
+54 −0
Original line number Diff line number Diff line 
// This file is autogenerated by hidl-gen. Do not edit manually.



genrule {

    name: "android.hardware.nfc@1.0_genc++",

    tool: "hidl-gen",

    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.nfc@1.0",

    srcs: [

        "types.hal",

        "INfc.hal",

        "INfcClientCallback.hal",

    ],

    out: [

        "android/hardware/nfc/1.0/types.cpp",

        "android/hardware/nfc/1.0/NfcAll.cpp",

        "android/hardware/nfc/1.0/NfcClientCallbackAll.cpp",

    ],

}



genrule {

    name: "android.hardware.nfc@1.0_genc++_headers",

    tool: "hidl-gen",

    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.nfc@1.0",

    srcs: [

        "types.hal",

        "INfc.hal",

        "INfcClientCallback.hal",

    ],

    out: [

        "android/hardware/nfc/1.0/types.h",

        "android/hardware/nfc/1.0/INfc.h",

        "android/hardware/nfc/1.0/IHwNfc.h",

        "android/hardware/nfc/1.0/BnNfc.h",

        "android/hardware/nfc/1.0/BpNfc.h",

        "android/hardware/nfc/1.0/BsNfc.h",

        "android/hardware/nfc/1.0/INfcClientCallback.h",

        "android/hardware/nfc/1.0/IHwNfcClientCallback.h",

        "android/hardware/nfc/1.0/BnNfcClientCallback.h",

        "android/hardware/nfc/1.0/BpNfcClientCallback.h",

        "android/hardware/nfc/1.0/BsNfcClientCallback.h",

    ],

}



cc_library_shared {

    name: "android.hardware.nfc@1.0",

    generated_sources: ["android.hardware.nfc@1.0_genc++"],

    generated_headers: ["android.hardware.nfc@1.0_genc++_headers"],

    export_generated_headers: ["android.hardware.nfc@1.0_genc++_headers"],

    shared_libs: [

        "libhidl",

        "libhwbinder",

        "libutils",

        "libcutils",

    ],

}

nfc/1.0/Android.mk

+20 −93
Original line number Diff line number Diff line 
LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)



LOCAL_MODULE := android.hardware.nfc@1.0

LOCAL_MODULE_CLASS := SHARED_LIBRARIES



intermediates := $(local-generated-sources-dir)



HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)



#

# Build types.hal

#

GEN := $(intermediates)/android/hardware/nfc/1.0/types.cpp

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Lc++ -randroid.hardware:hardware/interfaces \

        android.hardware.nfc@1.0::types



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build INfc.hal

#

GEN := $(intermediates)/android/hardware/nfc/1.0/NfcAll.cpp

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfc.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/INfcClientCallback.hal

$(GEN): $(LOCAL_PATH)/INfcClientCallback.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal

$(GEN): $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Lc++ -randroid.hardware:hardware/interfaces \

        android.hardware.nfc@1.0::INfc



$(GEN): $(LOCAL_PATH)/INfc.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build INfcClientCallback.hal

#

GEN := $(intermediates)/android/hardware/nfc/1.0/NfcClientCallbackAll.cpp

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfcClientCallback.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal

$(GEN): $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Lc++ -randroid.hardware:hardware/interfaces \

        android.hardware.nfc@1.0::INfcClientCallback



$(GEN): $(LOCAL_PATH)/INfcClientCallback.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)

# This file is autogenerated by hidl-gen. Do not edit manually.



LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)

LOCAL_SHARED_LIBRARIES := \

    libhidl \

    libhwbinder \

    libutils \

    libcutils \



LOCAL_MULTILIB := both

include $(BUILD_SHARED_LIBRARY)

LOCAL_PATH := $(call my-dir)



################################################################################
@@ -86,9 +13,9 @@ intermediates := $(local-generated-sources-dir) 
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)



#

# Build types.hal (nfc_event_t)

# Build types.hal (nfc_data_t)

#

GEN := $(intermediates)/android/hardware/nfc/1.0/nfc_event_t.java

GEN := $(intermediates)/android/hardware/nfc/1.0/nfc_data_t.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -96,16 +23,16 @@ $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) 
$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.nfc@1.0::types.nfc_event_t

        android.hardware.nfc@1.0::types.nfc_data_t



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (nfc_status_t)

# Build types.hal (nfc_event_t)

#

GEN := $(intermediates)/android/hardware/nfc/1.0/nfc_status_t.java

GEN := $(intermediates)/android/hardware/nfc/1.0/nfc_event_t.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -113,16 +40,16 @@ $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) 
$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.nfc@1.0::types.nfc_status_t

        android.hardware.nfc@1.0::types.nfc_event_t



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (nfc_data_t)

# Build types.hal (nfc_status_t)

#

GEN := $(intermediates)/android/hardware/nfc/1.0/nfc_data_t.java

GEN := $(intermediates)/android/hardware/nfc/1.0/nfc_status_t.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -130,7 +57,7 @@ $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) 
$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.nfc@1.0::types.nfc_data_t

        android.hardware.nfc@1.0::types.nfc_status_t



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)
@@ -189,9 +116,9 @@ intermediates := $(local-generated-sources-dir) 
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)



#

# Build types.hal (nfc_event_t)

# Build types.hal (nfc_data_t)

#

GEN := $(intermediates)/android/hardware/nfc/1.0/nfc_event_t.java

GEN := $(intermediates)/android/hardware/nfc/1.0/nfc_data_t.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -199,16 +126,16 @@ $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) 
$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.nfc@1.0::types.nfc_event_t

        android.hardware.nfc@1.0::types.nfc_data_t



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (nfc_status_t)

# Build types.hal (nfc_event_t)

#

GEN := $(intermediates)/android/hardware/nfc/1.0/nfc_status_t.java

GEN := $(intermediates)/android/hardware/nfc/1.0/nfc_event_t.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -216,16 +143,16 @@ $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) 
$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.nfc@1.0::types.nfc_status_t

        android.hardware.nfc@1.0::types.nfc_event_t



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (nfc_data_t)

# Build types.hal (nfc_status_t)

#

GEN := $(intermediates)/android/hardware/nfc/1.0/nfc_data_t.java

GEN := $(intermediates)/android/hardware/nfc/1.0/nfc_status_t.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -233,7 +160,7 @@ $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) 
$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.nfc@1.0::types.nfc_data_t

        android.hardware.nfc@1.0::types.nfc_status_t



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)