Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)

Bug: 166295507
Merged-In: Id6c11d1f63223260f5e71ea00b6499164c019abd
Change-Id: I756978f9fcd81c1ac4d6ac39dd4ade23ee05c443

diff --cc Android.bp
index 9c1b498,02e8e5d..b853e58
--- 1/Android.bp
--- 2/Android.bp
+++ b/Android.bp
@@@ -39,18 -36,9 +36,18 @@@ cc_defaults 
          "-Wcast-align",
          "-Wno-unused-parameter",
      ],
 +
      cppflags: ["-std=c++14"],
  
 -    vendor: true,
 +    shared_libs: [
 +        "libdrm",
 +    ],
 +}
 +
 +cc_defaults {
-     name: "minigbm_gralloc_defaults",
++    name: "minigbm_cros_gralloc_defaults",
 +
 +    defaults: ["minigbm_defaults"],
  
      header_libs: [
          "libhardware_headers",
@@@ -75,22 -65,24 +72,20 @@@
      static_libs: ["libarect"],
  
      export_static_lib_headers: ["libarect"],
 -}
 -
 -cc_defaults {
 -    name: "minigbm_cros_gralloc_defaults",
  
 -    defaults: ["minigbm_defaults"],
 +    vendor: true,
  
 -    srcs: [
 -        "cros_gralloc/cros_gralloc_buffer.cc",
 -        "cros_gralloc/cros_gralloc_helpers.cc",
 -        "cros_gralloc/cros_gralloc_driver.cc",
 -    ]
 +    shared_libs: [
 +        "libcutils",
 +        "libnativewindow",
 +        "libsync",
 +        "liblog",
 +    ],
- 
-     relative_install_path: "hw",
  }
  
 -cc_library_static {
 -    name: "libminigbm",
 +cc_library_host_shared {
 +    name: "libgbm",
      defaults: ["minigbm_defaults"],
 -    shared_libs: ["liblog"],
      static_libs: ["libdrm"],
  
      srcs: [
@@@ -134,7 -126,7 +129,7 @@@ cc_library_shared 
  
  cc_library_shared {
      name: "gralloc.minigbm_meson",
-     defaults: ["minigbm_gralloc_defaults"],
+     defaults: ["minigbm_cros_gralloc_defaults"],
      cflags: ["-DDRV_MESON"],
      srcs: ["cros_gralloc/gralloc0/gralloc0.cc"],
 -}
 +}