tequilaOS/platform_hardware_libhardware
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move default HAL libraries to vendor

Browse source 
Libraries under /hardware/libhardware/modules should go to /vendor/.

These are conventionl HALs for default implementations, most of them
are not used.

Camera and thermal are already moved in other CLs.

Bug: 35907904
Test: Compiled and checked install path. Verified on Sailfish with
$ lsof | grep default.

Change-Id: Ibde574001c01cbfea014a20a0fbbb3265e6cdc8a
This commit is contained in:
Po-Chien Hsueh 2017-03-02 15:44:24 +08:00
parent 88202b943f
commit c535b2fded
21 changed files with 29 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/README.android
View file

@ -4,13 +4,13 @@ Default (and possibly architecture dependents) HAL modules go here.
libhardware.so eventually should contain *just* the HAL hub
(hardware.c), everything in it should be rewritten as modules.
Modules are .so in /system/libs/hw/ and have a well defined naming
Modules are .so in /vendor/lib/hw/ and have a well defined naming
convention:
/system/libs/hw/<*_HARDWARE_MODULE_ID>.<ro.product.board>.so
/system/libs/hw/<*_HARDWARE_MODULE_ID>.<ro.board.platform>.so
/system/libs/hw/<*_HARDWARE_MODULE_ID>.<ro.arch>.so
/system/libs/hw/<*_HARDWARE_MODULE_ID>.default.so
/vendor/lib/hw/<*_HARDWARE_MODULE_ID>.<ro.product.board>.so
/vendor/lib/hw/<*_HARDWARE_MODULE_ID>.<ro.board.platform>.so
/vendor/lib/hw/<*_HARDWARE_MODULE_ID>.<ro.arch>.so
/vendor/lib/hw/<*_HARDWARE_MODULE_ID>.default.so
They also have a well defined interface which lives in include/hardware/.

3
modules/audio/Android.bp
View file

@ -21,6 +21,7 @@
cc_library_shared {
name: "audio.primary.default",
relative_install_path: "hw",
proprietary: true,
srcs: ["audio_hw.c"],
shared_libs: [
"liblog",
@ -38,6 +39,7 @@ cc_library_shared {
cc_library_shared {
name: "audio.stub.default",
relative_install_path: "hw",
proprietary: true,
srcs: ["audio_hw.c"],
shared_libs: [
"liblog",
@ -51,6 +53,7 @@ cc_library_shared {
cc_library_shared {
name: "audio_policy.stub",
relative_install_path: "hw",
proprietary: true,
srcs: ["audio_policy.c"],
shared_libs: [
"liblog",

1
modules/audio_remote_submix/Android.mk
View file

@ -18,6 +18,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := audio.r_submix.default
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_PROPRIETARY_MODULE := true
LOCAL_SRC_FILES := \
audio_hw.cpp
LOCAL_C_INCLUDES += \

1
modules/consumerir/Android.bp
View file

@ -15,6 +15,7 @@
cc_library_shared {
name: "consumerir.default",
relative_install_path: "hw",
proprietary: true,
srcs: ["consumerir.c"],
shared_libs: [
"liblog",

1
modules/fingerprint/Android.bp
View file

@ -15,6 +15,7 @@
cc_library_shared {
name: "fingerprint.default",
relative_install_path: "hw",
proprietary: true,
srcs: ["fingerprint.c"],
shared_libs: ["liblog"],
}

1
modules/gralloc/Android.mk
View file

@ -20,6 +20,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_PROPRIETARY_MODULE := true
LOCAL_SHARED_LIBRARIES := liblog libcutils
LOCAL_SRC_FILES := \

1
modules/hwcomposer/Android.mk
View file

@ -20,6 +20,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_PROPRIETARY_MODULE := true
LOCAL_SHARED_LIBRARIES := liblog libEGL
LOCAL_SRC_FILES := hwcomposer.cpp
LOCAL_MODULE := hwcomposer.default

1
modules/input/evdev/Android.mk
View file

@ -45,6 +45,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := input.evdev.default
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_PROPRIETARY_MODULE := true
LOCAL_SRC_FILES := \
EvdevModule.cpp

1
modules/local_time/Android.bp
View file

@ -24,6 +24,7 @@
cc_library_shared {
name: "local_time.default",
relative_install_path: "hw",
proprietary: true,
srcs: ["local_time_hw.c"],
shared_libs: [
"liblog",

1
modules/nfc-nci/Android.bp
View file

@ -15,6 +15,7 @@
cc_library_shared {
name: "nfc_nci.default",
relative_install_path: "hw",
proprietary: true,
srcs: ["nfc_nci_example.c"],
shared_libs: [
"liblog",

1
modules/nfc/Android.bp
View file

@ -15,6 +15,7 @@
cc_library_shared {
name: "nfc.default",
relative_install_path: "hw",
proprietary: true,
srcs: ["nfc_pn544_example.c"],
shared_libs: [
"liblog",

1
modules/power/Android.bp
View file

@ -15,6 +15,7 @@
cc_library_shared {
name: "power.default",
relative_install_path: "hw",
proprietary: true,
srcs: ["power.c"],
shared_libs: ["liblog"],
}

1
modules/radio/Android.mk
View file

@ -21,6 +21,7 @@ LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)
LOCAL_MODULE := radio.fm.default
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_PROPRIETARY_MODULE := true
LOCAL_SRC_FILES := radio_hw.c
LOCAL_SHARED_LIBRARIES := liblog libcutils libradio_metadata
LOCAL_MODULE_TAGS := optional

1
modules/sensors/Android.mk
View file

@ -23,6 +23,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := sensors.$(TARGET_DEVICE)
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_PROPRIETARY_MODULE := true
LOCAL_CFLAGS := -DLOG_TAG=\"MultiHal\"

1
modules/soundtrigger/Android.mk
View file

@ -19,6 +19,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := sound_trigger.stub.default
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_PROPRIETARY_MODULE := true
LOCAL_SRC_FILES := sound_trigger_hw.c
LOCAL_SHARED_LIBRARIES := liblog libcutils
LOCAL_MODULE_TAGS := optional

1
modules/tv_input/Android.bp
View file

@ -15,6 +15,7 @@
cc_library_shared {
name: "tv_input.default",
relative_install_path: "hw",
proprietary: true,
shared_libs: [
"libcutils",
"liblog",

1
modules/usbaudio/Android.mk
View file

@ -18,6 +18,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := audio.usb.default
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_PROPRIETARY_MODULE := true
LOCAL_SRC_FILES := \
audio_hal.c
LOCAL_C_INCLUDES += \

1
modules/vehicle/Android.mk
View file

@ -19,6 +19,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := vehicle.default
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_PROPRIETARY_MODULE := true
LOCAL_C_INCLUDES := hardware/libhardware
LOCAL_SRC_FILES := vehicle.c timeUtil.cpp
LOCAL_SHARED_LIBRARIES := liblog libcutils libutils

1
modules/vibrator/Android.bp
View file

@ -18,6 +18,7 @@ cc_library_shared {
// HAL module implementation stored in
// hw/<VIBRATOR_HARDWARE_MODULE_ID>.default.so
relative_install_path: "hw",
proprietary: true,
include_dirs: ["hardware/libhardware"],
srcs: ["vibrator.c"],
shared_libs: ["liblog"],

1
modules/vr/Android.mk
View file

@ -18,6 +18,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := vr.default
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_PROPRIETARY_MODULE := true
LOCAL_SRC_FILES := vr.c
LOCAL_SHARED_LIBRARIES := libcutils
LOCAL_MODULE_TAGS := optional

6
tests/vehicle/README
View file

@ -49,13 +49,13 @@ $ croot
$ mmm hardware/libhardware
This will generate the following binaries that we care about:
i) out/target/product/XXX/system/lib/hw/vehicle.default.so
i) out/target/product/XXX/vendor/lib/hw/vehicle.default.so
ii) out/target/product/XXX/data/nativetest/vehicle_tests
iii) out/target/product/XXX/system/bin/vehicle-hal-tool
The location for the first shared library would be:
$ adb push out/target/product/XXX/system/lib/hw/vehicle.default.so
/system/lib/hw
$ adb push out/target/product/XXX/vendor/lib/hw/vehicle.default.so
/vendor/lib/hw
You can also use 'adb sync' if you like, although this is the easiest least
hassle way of putting it in place.