Merge "configstore: configstore HAL uprev'ed to 1.1" into pi-dev (ff866b9b) · Commits · e / os / android_hardware_interfaces

CleanSpec.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -64,3 +64,5 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/android.hardware.tests*)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/vndk/android.hardware.tests*)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/vndk-sp/android.hardware.graphics.allocator*)
		$(call add-clean-step, find $(PRODUCT_OUT)/system $(PRODUCT_OUT)/vendor -type f -name "android\.hardware\.configstore\@1\.1*" -print0 \| xargs -0 rm -f)
		$(call add-clean-step, find $(PRODUCT_OUT)/system $(PRODUCT_OUT)/vendor -type f -name "android\.hardware\.configstore*" -print0 \| xargs -0 rm -f)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/seccomp_policy/configstore@1.0.policy)

+1 −1

Original line number	Diff line number	Diff line
		@@ -113,7 +113,7 @@
		</hal>
		<hal format="hidl" optional="false">
		<name>android.hardware.configstore</name>
		<version>1.0</version>
		<version>1.0-1</version>
		<interface>
		<name>ISurfaceFlingerConfigs</name>
		<instance>default</instance>

0 → 100644

+23 −0

Original line number	Diff line number	Diff line
		// This file is autogenerated by hidl-gen -Landroidbp.

		hidl_interface {
		name: "android.hardware.configstore@1.1",
		root: "android.hardware",
		vndk: {
		enabled: true,
		},
		srcs: [
		"types.hal",
		"ISurfaceFlingerConfigs.hal",
		],
		interfaces: [
		"android.hardware.configstore@1.0",
		"android.hidl.base@1.0",
		],
		types: [
		"DisplayOrientation",
		"OptionalDisplayOrientation",
		],
		gen_java: true,
		}

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 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 {
		/**
		* Returns the orientation of the primary display device.
		*/
		primaryDisplayOrientation() generates (OptionalDisplayOrientation value);
		};

+7 −6

Original line number	Diff line number	Diff line
		@@ -2,15 +2,15 @@ LOCAL_PATH := $(call my-dir)

		################################################################################
		include $(CLEAR_VARS)
		LOCAL_MODULE := android.hardware.configstore@1.0-service
		LOCAL_MODULE := android.hardware.configstore@1.1-service
		# seccomp is not required for coverage build.
		ifneq ($(NATIVE_COVERAGE),true)
		LOCAL_REQUIRED_MODULES_arm64 := configstore@1.0.policy
		LOCAL_REQUIRED_MODULES_arm64 := configstore@1.1.policy
		endif
		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
		@@ -22,16 +22,17 @@ LOCAL_SHARED_LIBRARIES := \
		libhwminijail \
		liblog \
		libutils \
		android.hardware.configstore@1.0
		android.hardware.configstore@1.0 \
		android.hardware.configstore@1.1

		include $(BUILD_EXECUTABLE)

		# seccomp filter for configstore
		ifeq ($(TARGET_ARCH), $(filter $(TARGET_ARCH), arm64))
		include $(CLEAR_VARS)
		LOCAL_MODULE := configstore@1.0.policy
		LOCAL_MODULE := configstore@1.1.policy
		LOCAL_MODULE_CLASS := ETC
		LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/seccomp_policy
		LOCAL_SRC_FILES := seccomp_policy/configstore@1.0-$(TARGET_ARCH).policy
		LOCAL_SRC_FILES := seccomp_policy/configstore@1.1-$(TARGET_ARCH).policy
		include $(BUILD_PREBUILT)
		endif