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

Commit 891220af authored by Yifan Hong's avatar Yifan Hong
Browse files

health 1.0 default -> Soong 

Now that HAL_STATIC_LIBS are removed, convert to Soong.
Also, avoid using global includes and use libbase_headers instead.

Test: builds
Change-Id: I50ef691e049ed0943de6f384ce7ddba96c0345a5
parent 16273aea

health/1.0/default/Android.bp

+42 −0
Original line number Diff line number Diff line
@@ -18,3 +18,45 @@ cc_library_static { 


}



cc_library_shared {

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

    vendor: true,

    relative_install_path: "hw",

    srcs: ["Health.cpp"],



    header_libs: [

        "libbase_headers",

        "libhealthd_headers",

    ],



    shared_libs: [

        "libcutils",

        "libhidlbase",

        "liblog",

        "libutils",

        "android.hardware.health@1.0",

    ],



    static_libs: [

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

        "libhealthd.default",

    ],

}



cc_binary {

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

    vendor: true,

    relative_install_path: "hw",

    init_rc: ["android.hardware.health@1.0-service.rc"],

    srcs: ["HealthService.cpp"],



    shared_libs: [

        "liblog",

        "libcutils",

        "libdl",

        "libbase",

        "libutils",

        "libhidlbase",

        "android.hardware.health@1.0",

    ],

}

health/1.0/default/Android.mk

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



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/base/include

LOCAL_SRC_FILES := \

    Health.cpp \



LOCAL_HEADER_LIBRARIES := libhealthd_headers



LOCAL_SHARED_LIBRARIES := \

    libcutils \

    libhidlbase \

    liblog \

    libutils \

    android.hardware.health@1.0 \



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



LOCAL_STATIC_LIBRARIES += libhealthd.default



include $(BUILD_SHARED_LIBRARY)



include $(CLEAR_VARS)

LOCAL_PROPRIETARY_MODULE := true

LOCAL_MODULE_RELATIVE_PATH := hw

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

LOCAL_INIT_RC := android.hardware.health@1.0-service.rc

LOCAL_SRC_FILES := \

    HealthService.cpp \



LOCAL_SHARED_LIBRARIES := \

    liblog \

    libcutils \

    libdl \

    libbase \

    libutils \

    libhidlbase \

    android.hardware.health@1.0 \



include $(BUILD_EXECUTABLE)



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