summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnkit Goyal <layog@google.com>2022-01-07 19:57:37 +0000
committerAnkit Goyal <layog@google.com>2022-01-07 19:57:37 +0000
commit167321fcf0e5cc4ad90eed780ce08c28d9ab27eb (patch)
treee6439c8bdf8012833b5e2aeda3094245a11f4059
parent153fde544bda6429a63360c9403f3ea3883a7497 (diff)
downloadgchips-167321fcf0e5cc4ad90eed780ce08c28d9ab27eb.tar.gz
Revert^2 "Namespace gralloc4"
153fde544bda6429a63360c9403f3ea3883a7497 Change-Id: I8b79049f5d79346f259260c30e6adec679d1bb76
-rw-r--r--Android.bp6
-rw-r--r--gralloc4/Android.bp7
-rw-r--r--libvendorgraphicbuffer/Android.bp4
3 files changed, 15 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index bf2bb07..e194922 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,9 @@
soong_namespace {
- imports: ["hardware/google/graphics/common"]
+ imports: [
+ "hardware/google/graphics/common",
+ "hardware/google/gchips/gralloc4",
+ "hardware/google/gchips/GrallocHAL",
+ ]
}
package {
diff --git a/gralloc4/Android.bp b/gralloc4/Android.bp
index c30c359..bbac925 100644
--- a/gralloc4/Android.bp
+++ b/gralloc4/Android.bp
@@ -15,6 +15,13 @@
* limitations under the License.
*/
+soong_namespace {
+ imports: [
+ "hardware/google/graphics/common",
+ "hardware/google/gchips",
+ ]
+}
+
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
diff --git a/libvendorgraphicbuffer/Android.bp b/libvendorgraphicbuffer/Android.bp
index 228d0c1..53e76aa 100644
--- a/libvendorgraphicbuffer/Android.bp
+++ b/libvendorgraphicbuffer/Android.bp
@@ -42,8 +42,10 @@ cc_library_shared {
"libgralloctypes",
"libhidlbase",
],
+ header_libs: [
+ "libgralloc_headers",
+ ],
include_dirs: [
- "hardware/google/gchips/gralloc4/src",
"hardware/google/gchips/include",
],
export_include_dirs: [