diff options
10 files changed, 24 insertions, 8 deletions
diff --git a/services/surfaceflinger/Android.bp b/services/surfaceflinger/Android.bp index c3324af3e3..52c68df814 100644 --- a/services/surfaceflinger/Android.bp +++ b/services/surfaceflinger/Android.bp @@ -47,7 +47,7 @@ cc_defaults { "libhwbinder", "liblayers_proto", "liblog", - "libnativewindow", + "libnativewindow", "libpdx_default_transport", "libprocessgroup", "libprotobuf-cpp-lite", @@ -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", + ], } diff --git a/services/surfaceflinger/SurfaceFlingerProperties.cpp b/services/surfaceflinger/SurfaceFlingerProperties.cpp index e130511e94..09b793a035 100644 --- a/services/surfaceflinger/SurfaceFlingerProperties.cpp +++ b/services/surfaceflinger/SurfaceFlingerProperties.cpp @@ -1,6 +1,4 @@ -#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> diff --git a/services/surfaceflinger/SurfaceFlingerProperties.h b/services/surfaceflinger/SurfaceFlingerProperties.h index 6f90117458..b2fafddfe7 100644 --- a/services/surfaceflinger/SurfaceFlingerProperties.h +++ b/services/surfaceflinger/SurfaceFlingerProperties.h @@ -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> diff --git a/services/surfaceflinger/sysprop/Android.bp b/services/surfaceflinger/sysprop/Android.bp new file mode 100644 index 0000000000..7721d7d2b7 --- /dev/null +++ b/services/surfaceflinger/sysprop/Android.bp @@ -0,0 +1,6 @@ +sysprop_library { + name: "SurfaceFlingerProperties", + srcs: ["*.sysprop"], + api_packages: ["android.sysprop"], + property_owner: "Platform", +} diff --git a/services/surfaceflinger/sysprop/api/current.txt b/services/surfaceflinger/sysprop/api/current.txt new file mode 100644 index 0000000000..d802177e24 --- /dev/null +++ b/services/surfaceflinger/sysprop/api/current.txt @@ -0,0 +1 @@ +// Signature format: 2.0 diff --git a/services/surfaceflinger/sysprop/api/removed.txt b/services/surfaceflinger/sysprop/api/removed.txt new file mode 100644 index 0000000000..d802177e24 --- /dev/null +++ b/services/surfaceflinger/sysprop/api/removed.txt @@ -0,0 +1 @@ +// Signature format: 2.0 diff --git a/services/surfaceflinger/sysprop/api/system-current.txt b/services/surfaceflinger/sysprop/api/system-current.txt new file mode 100644 index 0000000000..d802177e24 --- /dev/null +++ b/services/surfaceflinger/sysprop/api/system-current.txt @@ -0,0 +1 @@ +// Signature format: 2.0 diff --git a/services/surfaceflinger/sysprop/api/system-removed.txt b/services/surfaceflinger/sysprop/api/system-removed.txt new file mode 100644 index 0000000000..d802177e24 --- /dev/null +++ b/services/surfaceflinger/sysprop/api/system-removed.txt @@ -0,0 +1 @@ +// Signature format: 2.0 diff --git a/services/surfaceflinger/sysprop/api/test-current.txt b/services/surfaceflinger/sysprop/api/test-current.txt new file mode 100644 index 0000000000..d802177e24 --- /dev/null +++ b/services/surfaceflinger/sysprop/api/test-current.txt @@ -0,0 +1 @@ +// Signature format: 2.0 diff --git a/services/surfaceflinger/sysprop/api/test-removed.txt b/services/surfaceflinger/sysprop/api/test-removed.txt new file mode 100644 index 0000000000..d802177e24 --- /dev/null +++ b/services/surfaceflinger/sysprop/api/test-removed.txt @@ -0,0 +1 @@ +// Signature format: 2.0 |