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

Commit 0c5f3638 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Move hidl shims to the vendor partition. am: 46c0b949 

am: 0a9133b2

Change-Id: Ibe01a4a070c612b86fb31c0543695df5da924624
parents f4044876 0a9133b2

CleanSpec.mk

0 → 100644
+50 −0
Original line number Diff line number Diff line 
# 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*)

boot/1.0/default/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -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 := \

boot/1.0/default/android.hardware.boot@1.0-service.rc

+1 −1
Original line number Diff line number Diff line 
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

ir/1.0/default/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -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"],

ir/1.0/default/android.hardware.ir@1.0-service.rc

+1 −1
Original line number Diff line number Diff line 
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
 
 No newline at end of file