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

Commit c1cad35a authored by Steven Moreland's avatar Steven Moreland
Browse files

Compile health hal with the VNDK. 

Test: builds with BOARD_VNDK_VERSION=current
Change-Id: I38ea5afed47026f6068e9aac5de3435ec031f836
parent 6f6840a9

health/1.0/default/Android.bp

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

    "libhealthd",

]



cc_library_static {

    name: "android.hardware.health@1.0-convert",

    vendor_available: true,

    srcs: ["convert.cpp"],

    include_dirs: [

        "system/core/base/include",

    ],

    header_libs: ["libhealthd_headers"],

    export_header_lib_headers: ["libhealthd_headers"],

    export_include_dirs: ["include"],

    shared_libs: [

        "libcutils",

        "libhidlbase",

        "libhidltransport",

        "libutils",

        "android.hardware.health@1.0",

    ],



}

health/1.0/default/Android.mk

+3 −15
Original line number Diff line number Diff line
@@ -4,10 +4,12 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := android.hardware.health@1.0-impl

LOCAL_PROPRIETARY_MODULE := true

LOCAL_MODULE_RELATIVE_PATH := hw

LOCAL_C_INCLUDES := system/core/healthd/include system/core/base/include

LOCAL_C_INCLUDES := system/core/base/include

LOCAL_SRC_FILES := \

    Health.cpp \



LOCAL_HEADER_LIBRARIES := libhealthd_headers



LOCAL_SHARED_LIBRARIES := \

    libcutils \

    libhidlbase \
@@ -22,20 +24,6 @@ LOCAL_HAL_STATIC_LIBRARIES := libhealthd 


include $(BUILD_SHARED_LIBRARY)



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.health@1.0-convert

LOCAL_SRC_FILES := convert.cpp

LOCAL_C_INCLUDES := system/core/healthd/include system/core/base/include

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include

LOCAL_SHARED_LIBRARIES := \

    libcutils \

    libhidlbase \

    libhidltransport \

    libutils \

    android.hardware.health@1.0 \



include $(BUILD_STATIC_LIBRARY)



include $(CLEAR_VARS)

LOCAL_PROPRIETARY_MODULE := true

LOCAL_MODULE_RELATIVE_PATH := hw

health/1.0/default/libhealthd/Android.bp

0 → 100644
+10 −0
Original line number Diff line number Diff line 
// Copyright 2016 The Android Open Source Project



cc_library_static {

    srcs: ["healthd_board_default.cpp"],

    name: "libhealthd.default",

    vendor_available: true,

    cflags: ["-Werror"],

    include_dirs: ["system/core/base/include"],

    header_libs: ["libhealthd_headers"],

}

health/1.0/default/libhealthd/Android.mk

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
# Copyright 2016 The Android Open Source Project



LOCAL_PATH := $(call my-dir)



include $(CLEAR_VARS)

LOCAL_SRC_FILES := healthd_board_default.cpp

LOCAL_MODULE := libhealthd.default

LOCAL_CFLAGS := -Werror

LOCAL_C_INCLUDES := system/core/healthd/include system/core/base/include

include $(BUILD_STATIC_LIBRARY)

health/Android.bp

+1 −0
Original line number Diff line number Diff line 
// This is an autogenerated file, do not edit.

subdirs = [

    "1.0",

    "1.0/default",

    "1.0/vts/functional",

]