1 files changed, 6 insertions, 92 deletions

diff --git a/libs/gui/Android.bp b/libs/gui/Android.bp
index 64203f78a8..4a4510e047 100644
--- a/libs/gui/Android.bp
+++ b/libs/gui/Android.bp
@@ -11,15 +11,6 @@
 // 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 {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "frameworks_native_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["frameworks_native_license"],
-}
-
 cc_library_headers {
     name: "libgui_headers",
     vendor_available: true,
@@ -39,71 +30,18 @@ cc_library_headers {
     min_sdk_version: "29",
 }
 
-cc_library_headers {
-    name: "libgui_aidl_headers",
-    vendor_available: true,
-    static_libs: [
-        "libgui_aidl_static",
-    ],
-
-    export_static_lib_headers: [
-        "libgui_aidl_static",
-    ],
-}
-
-filegroup {
-    name: "libgui_aidl",
-    srcs: ["aidl/**/*.aidl"],
-    path: "aidl/",
-}
-
-cc_library_static {
-    name: "libgui_aidl_static",
-    vendor_available: true,
-    srcs: [
-        ":libgui_aidl",
-    ],
-
-    shared_libs: [
-        "libbinder",
-        "libui",
-    ],
-
-    local_include_dirs: [
-        "include",
-    ],
-
-    export_shared_lib_headers: [
-        "libbinder",
-    ],
-
-    aidl: {
-        export_aidl_headers: true
-    }
-}
-
-
 cc_library_shared {
     name: "libgui",
-    vendor_available: true,
+    vendor_available: false,
     vndk: {
         enabled: true,
-        private: true,
     },
     double_loadable: true,
 
     defaults: ["libgui_bufferqueue-defaults"],
 
-    static_libs: [
-        "libgui_aidl_static",
-    ],
-    export_static_lib_headers: [
-        "libgui_aidl_static",
-    ],
-
     srcs: [
         ":framework_native_aidl",
-        ":inputconstants_aidl",
         ":libgui_bufferqueue_sources",
 
         "BitTube.cpp",
@@ -116,8 +54,8 @@ cc_library_shared {
         "DebugEGLImageTracker.cpp",
         "DisplayEventDispatcher.cpp",
         "DisplayEventReceiver.cpp",
-        "FrameTimelineInfo.cpp",
         "GLConsumer.cpp",
+        "GuiConfig.cpp",
         "IConsumerListener.cpp",
         "IDisplayEventConnection.cpp",
         "IGraphicBufferConsumer.cpp",
@@ -132,12 +70,10 @@ cc_library_shared {
         "LayerState.cpp",
         "OccupancyTracker.cpp",
         "StreamSplitter.cpp",
-        "ScreenCaptureResults.cpp",
         "Surface.cpp",
         "SurfaceControl.cpp",
         "SurfaceComposerClient.cpp",
         "SyncFeatures.cpp",
-        "TransactionTracing.cpp",
         "view/Surface.cpp",
         "bufferqueue/1.0/B2HProducerListener.cpp",
         "bufferqueue/1.0/H2BGraphicBufferProducer.cpp",
@@ -156,11 +92,6 @@ cc_library_shared {
 
     export_shared_lib_headers: [
         "libbinder",
-        "libinput",
-    ],
-
-    export_header_lib_headers: [
-        "libgui_aidl_headers",
     ],
 
     // bufferhub is not used when building libgui for vendors
@@ -184,24 +115,14 @@ cc_library_shared {
         },
     },
 
-    aidl: {
-        export_aidl_headers: true,
-    },
-
     header_libs: [
         "libdvr_headers",
-        "libgui_aidl_headers",
         "libpdx_headers",
     ],
 
-    pgo: {
-        sampling: true,
-        profile_file: "libgui/libgui.profdata",
-    },
-
-    lto: {
-        thin: true,
-    },
+    aidl: {
+        export_aidl_headers: true,
+    }
 }
 
 // Used by media codec services exclusively as a static lib for
@@ -223,16 +144,13 @@ cc_library_static {
     defaults: ["libgui_bufferqueue-defaults"],
 
     srcs: [
-        ":inputconstants_aidl",
         ":libgui_bufferqueue_sources",
-        ":libgui_aidl",
     ],
 }
 
 filegroup {
     name: "libgui_bufferqueue_sources",
     srcs: [
-        "BatchBufferOps.cpp",
         "BufferItem.cpp",
         "BufferQueue.cpp",
         "BufferQueueConsumer.cpp",
@@ -243,7 +161,7 @@ filegroup {
         "FrameTimestamps.cpp",
         "GLConsumerUtils.cpp",
         "HdrMetadata.cpp",
-        "IGraphicBufferProducerFlattenables.cpp",
+        "QueueBufferInputOutput.cpp",
         "bufferqueue/1.0/Conversion.cpp",
         "bufferqueue/1.0/H2BProducerListener.cpp",
         "bufferqueue/1.0/WProducerListener.cpp",
@@ -309,10 +227,6 @@ cc_defaults {
         "libnativebase_headers",
     ],
 
-    include_dirs: [
-        "frameworks/native/include",
-    ],
-
     export_shared_lib_headers: [
         "libEGL",
         "libnativewindow",