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

Commit 814746e1 authored by Jaesoo Lee's avatar Jaesoo Lee Committed by Android (Google) Code Review
Browse files

Merge "configstore: configstore HAL is up-revisioned to 1.1"

parents 082d5803 812e85e1

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -55,3 +55,4 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/init/android.hardware.bl 
$(call add-clean-step, rm -rf $(OUT)/soong/.intermediates/)

$(call add-clean-step, rm -rf $(OUT_DIR)/soong/.intermediates/hardware/interfaces/)

$(call add-clean-step, rm -rf $(OUT_DIR)/soong/.intermediates/hardware/interfaces/)

$(call add-clean-step, find $(PRODUCT_OUT)/system $(PRODUCT_OUT)/vendor -type f -name "android\.hardware\.configstore*" -print0 | xargs -0 rm -f)
 
 No newline at end of file

configstore/1.1/Android.bp

0 → 100644
+60 −0
Original line number Diff line number Diff line 
// This file is autogenerated by hidl-gen. Do not edit manually.



filegroup {

    name: "android.hardware.configstore@1.1_hal",

    srcs: [

        "ISurfaceFlingerConfigs.hal",

    ],

}



genrule {

    name: "android.hardware.configstore@1.1_genc++",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.1",

    srcs: [

        ":android.hardware.configstore@1.1_hal",

    ],

    out: [

        "android/hardware/configstore/1.1/SurfaceFlingerConfigsAll.cpp",

    ],

}



genrule {

    name: "android.hardware.configstore@1.1_genc++_headers",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.1",

    srcs: [

        ":android.hardware.configstore@1.1_hal",

    ],

    out: [

        "android/hardware/configstore/1.1/ISurfaceFlingerConfigs.h",

        "android/hardware/configstore/1.1/IHwSurfaceFlingerConfigs.h",

        "android/hardware/configstore/1.1/BnHwSurfaceFlingerConfigs.h",

        "android/hardware/configstore/1.1/BpHwSurfaceFlingerConfigs.h",

        "android/hardware/configstore/1.1/BsSurfaceFlingerConfigs.h",

    ],

}



cc_library_shared {

    name: "android.hardware.configstore@1.1",

    generated_sources: ["android.hardware.configstore@1.1_genc++"],

    generated_headers: ["android.hardware.configstore@1.1_genc++_headers"],

    export_generated_headers: ["android.hardware.configstore@1.1_genc++_headers"],

    vendor_available: true,

    shared_libs: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "liblog",

        "libutils",

        "libcutils",

        "android.hardware.configstore@1.0",

    ],

    export_shared_lib_headers: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "libutils",

        "android.hardware.configstore@1.0",

    ],

}

configstore/1.1/Android.mk

0 → 100644
+78 −0
Original line number Diff line number Diff line 
# This file is autogenerated by hidl-gen. Do not edit manually.



LOCAL_PATH := $(call my-dir)



################################################################################



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.configstore-V1.1-java

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



intermediates := $(call local-generated-sources-dir, COMMON)



HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)



LOCAL_JAVA_LIBRARIES := \

    android.hardware.configstore-V1.0-java \

    android.hidl.base-V1.0-java \





#

# Build ISurfaceFlingerConfigs.hal

#

GEN := $(intermediates)/android/hardware/configstore/V1_1/ISurfaceFlingerConfigs.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISurfaceFlingerConfigs.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.configstore@1.1::ISurfaceFlingerConfigs



$(GEN): $(LOCAL_PATH)/ISurfaceFlingerConfigs.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)

include $(BUILD_JAVA_LIBRARY)





################################################################################



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.configstore-V1.1-java-static

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



intermediates := $(call local-generated-sources-dir, COMMON)



HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)



LOCAL_STATIC_JAVA_LIBRARIES := \

    android.hardware.configstore-V1.0-java-static \

    android.hidl.base-V1.0-java-static \





#

# Build ISurfaceFlingerConfigs.hal

#

GEN := $(intermediates)/android/hardware/configstore/V1_1/ISurfaceFlingerConfigs.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISurfaceFlingerConfigs.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.configstore@1.1::ISurfaceFlingerConfigs



$(GEN): $(LOCAL_PATH)/ISurfaceFlingerConfigs.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)

include $(BUILD_STATIC_JAVA_LIBRARY)







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

configstore/1.1/ISurfaceFlingerConfigs.hal

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.1 (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.1

 *

 * 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.

 */

package android.hardware.configstore@1.1;



import @1.0::ISurfaceFlingerConfigs;



/**

 * New revision of ISurfaceFlingerConfigs

 */



interface ISurfaceFlingerConfigs extends @1.0::ISurfaceFlingerConfigs {

};

configstore/1.0/default/Android.mk→configstore/1.1/default/Android.mk

+3 −2
Original line number Diff line number Diff line
@@ -2,17 +2,18 @@ LOCAL_PATH := $(call my-dir) 


################################################################################

include $(CLEAR_VARS)

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

LOCAL_MODULE := android.hardware.configstore@1.1-service

LOCAL_PROPRIETARY_MODULE := true

LOCAL_MODULE_CLASS := EXECUTABLES

LOCAL_MODULE_RELATIVE_PATH := hw

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

LOCAL_INIT_RC := android.hardware.configstore@1.1-service.rc

LOCAL_SRC_FILES:= service.cpp



include $(LOCAL_PATH)/surfaceflinger.mk



LOCAL_SHARED_LIBRARIES := \

    android.hardware.configstore@1.0 \

    android.hardware.configstore@1.1 \

    libhidlbase \

    libhidltransport \

    libbase \