Merge "Migrate SurfaceFlingerProps into sysprop_library" (d75ec8ff) · Commits · e / os / android_frameworks_native

services/surfaceflinger/Android.bp

+11 −5

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@ cc_defaults {
		"libui",
		"libinput",
		"libutils",
		"libSurfaceFlingerProperties",
		"libSurfaceFlingerProp",
		],
		static_libs: [
		"libcompositionengine",
		@@ -222,7 +222,7 @@ cc_binary {
		srcs: [":surfaceflinger_binary_sources"],
		shared_libs: [
		"libsurfaceflinger",
		"libSurfaceFlingerProperties",
		"libSurfaceFlingerProp",
		],
		}

		@@ -233,10 +233,9 @@ subdirs = [
		]

		cc_library_shared {
		name: "libSurfaceFlingerProperties",
		name: "libSurfaceFlingerProp",
		srcs: [
		"SurfaceFlingerProperties.cpp",
		"sysprop/*.sysprop",
		],
		shared_libs: [
		"android.hardware.configstore-utils",
		@@ -248,6 +247,10 @@ cc_library_shared {
		"libhwbinder",
		"libui",
		"libutils",
		"liblog",
		],
		static_libs: [
		"SurfaceFlingerProperties",
		],
		export_shared_lib_headers: [
		"android.hardware.graphics.common@1.2",
		@@ -255,4 +258,7 @@ cc_library_shared {
		"libhidltransport",
		"libhwbinder",
		],
		export_static_lib_headers: [
		"SurfaceFlingerProperties",
		],
		}

+0 −2

Original line number	Diff line number	Diff line

		#include <sysprop/SurfaceFlingerProperties.sysprop.h>

		#include <android/hardware/configstore/1.0/ISurfaceFlingerConfigs.h>
		#include <android/hardware/configstore/1.1/ISurfaceFlingerConfigs.h>
		#include <android/hardware/configstore/1.1/types.h>

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,9 +2,9 @@
		#ifndef SURFACEFLINGERPROPERTIES_H_
		#define SURFACEFLINGERPROPERTIES_H_

		#include <SurfaceFlingerProperties.sysprop.h>
		#include <android/hardware/configstore/1.1/ISurfaceFlingerConfigs.h>
		#include <android/hardware/graphics/common/1.2/types.h>
		#include <sysprop/SurfaceFlingerProperties.sysprop.h>
		#include <ui/ConfigStoreTypes.h>

		#include <cstdint>

0 → 100644

+6 −0

Original line number	Diff line number	Diff line
		sysprop_library {
		name: "SurfaceFlingerProperties",
		srcs: ["*.sysprop"],
		api_packages: ["android.sysprop"],
		property_owner: "Platform",
		}

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		// Signature format: 2.0