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

Move hidl shims to the vendor partition.

Browse source 
We need google shims on the vendor partition because they are providing
an implementation of a vendor defined interface. They were written by
google just as a courtesy/to make the transition easier. They're
basically a set for vendors to assemble their hal implementations
from.

Bug: 34135607
Test: marlin persist.hal.binderization on/off

Merged-In: I3f86c77c147514fe470f08088a66de312ae32d4e
Change-Id: I3f86c77c147514fe470f08088a66de312ae32d4e
This commit is contained in:
Steven Moreland 2017-01-12 13:33:16 -08:00
parent 3646298ab6
commit 46c0b94992
16 changed files with 68 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
CleanSpec.mk Normal file
View file

@ -0,0 +1,50 @@
# Copyright 2017 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# If you don't need to do a full clean build but would like to touch
# a file or delete some intermediate files, add a clean step to the end
# of the list. These steps will only be run once, if they haven't been
# run before.
#
# E.g.:
# $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
#
# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
# files that are missing or have been moved.
#
# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
# Use $(OUT_DIR) to refer to the "out" directory.
#
# If you need to re-do something that's already mentioned, just copy
# the command and add it to the bottom of the list. E.g., if a change
# that you made last week required touching a file and a change you
# made today requires touching the same file, just copy the old
# touch step and add it to the end of the list.
#
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************
# For example:
#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/hw/android.hardware*)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/hw/android.hardware*)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/hw/android.hardware*)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/init/android.hardware*)

2
boot/1.0/default/Android.mk
View file

@ -3,6 +3,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.boot@1.0-impl
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_PROPRIETARY_MODULE := true
LOCAL_SRC_FILES := \
BootControl.cpp \
@ -19,6 +20,7 @@ include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE := android.hardware.boot@1.0-service
LOCAL_INIT_RC := android.hardware.boot@1.0-service.rc
LOCAL_SRC_FILES := \

2
boot/1.0/default/android.hardware.boot@1.0-service.rc
View file

@ -1,4 +1,4 @@
service boot-hal-1-0 /system/bin/hw/android.hardware.boot@1.0-service
service boot-hal-1-0 /vendor/bin/hw/android.hardware.boot@1.0-service
class hal
user root
group root

2
ir/1.0/default/Android.bp
View file

@ -15,6 +15,7 @@
cc_library_shared {
name: "android.hardware.ir@1.0-impl",
relative_install_path: "hw",
proprietary: true,
srcs: ["ConsumerIr.cpp"],
shared_libs: [
"libhidlbase",
@ -30,6 +31,7 @@ cc_library_shared {
cc_binary {
relative_install_path: "hw",
name: "android.hardware.ir@1.0-service",
proprietary: true,
init_rc: ["android.hardware.ir@1.0-service.rc"],
srcs: ["service.cpp"],

2
ir/1.0/default/android.hardware.ir@1.0-service.rc
View file

@ -1,4 +1,4 @@
service ir-hal-1-0 /system/bin/hw/android.hardware.ir@1.0-service
service ir-hal-1-0 /vendor/bin/hw/android.hardware.ir@1.0-service
class hal
user system
group system

1
nfc/1.0/default/Android.bp
View file

@ -1,6 +1,7 @@
cc_library_shared {
name: "android.hardware.nfc@1.0-impl",
relative_install_path: "hw",
proprietary: true,
srcs: ["Nfc.cpp"],
shared_libs: [
"liblog",

2
nfc/1.0/default/Android.mk
View file

@ -2,6 +2,7 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE := android.hardware.nfc@1.0-service
LOCAL_INIT_RC := android.hardware.nfc@1.0-service.rc
LOCAL_SRC_FILES := \
@ -22,4 +23,5 @@ LOCAL_SHARED_LIBRARIES += \
libhidltransport \
android.hardware.nfc@1.0 \
include $(BUILD_EXECUTABLE)

2
nfc/1.0/default/android.hardware.nfc@1.0-service.rc
View file

@ -1,4 +1,4 @@
service nfc_hal_service /system/bin/hw/android.hardware.nfc@1.0-service
service nfc_hal_service /vendor/bin/hw/android.hardware.nfc@1.0-service
class hal
user nfc
group nfc

1
tests/bar/1.0/default/Android.bp
View file

@ -3,6 +3,7 @@
cc_library_shared {
name: "android.hardware.tests.bar@1.0-impl",
relative_install_path: "hw",
proprietary: true,
srcs: [
"Bar.cpp",
"ImportTypes.cpp",

1
tests/foo/1.0/default/Android.bp
View file

@ -3,6 +3,7 @@
cc_library_shared {
name: "android.hardware.tests.foo@1.0-impl",
relative_install_path: "hw",
proprietary: true,
srcs: [
"Foo.cpp",
],

1
tests/inheritance/1.0/default/Android.bp
View file

@ -3,6 +3,7 @@
cc_library_shared {
name: "android.hardware.tests.inheritance@1.0-impl",
relative_install_path: "hw",
proprietary: true,
srcs: [
"Fetcher.cpp",
"Parent.cpp",

1
tests/libhwbinder/1.0/default/Android.bp
View file

@ -1,6 +1,7 @@
cc_library_shared {
name: "android.hardware.tests.libhwbinder@1.0-impl",
relative_install_path: "hw",
proprietary: true,
srcs: [
"Benchmark.cpp",
],

1
tests/memory/1.0/default/Android.bp
View file

@ -14,6 +14,7 @@
cc_library_shared {
name: "android.hardware.tests.memory@1.0-impl",
proprietary: true,
relative_install_path: "hw",
srcs: [
"MemoryTest.cpp",

1
tests/pointer/1.0/default/Android.bp
View file

@ -3,6 +3,7 @@
cc_library_shared {
name: "android.hardware.tests.pointer@1.0-impl",
relative_install_path: "hw",
proprietary: true,
srcs: [
"Graph.cpp",
"Pointer.cpp",

1
wifi/1.0/default/Android.mk
View file

@ -16,6 +16,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.wifi@1.0-service
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_PROPRIETARY_MODULE := true
LOCAL_CPPFLAGS := -Wall -Werror -Wextra
LOCAL_SRC_FILES := \
hidl_struct_util.cpp \

2
wifi/1.0/default/android.hardware.wifi@1.0-service.rc
View file

@ -1,4 +1,4 @@
service wifi_hal_legacy /system/bin/hw/android.hardware.wifi@1.0-service
service wifi_hal_legacy /vendor/bin/hw/android.hardware.wifi@1.0-service
class hal
user wifi
group wifi