diff options
| author | Shubham Dubey <dubeyshubham@google.com> | 2022-01-07 15:25:17 +0000 |
|---|---|---|
| committer | Shubham Dubey <dubeyshubham@google.com> | 2022-01-07 15:25:17 +0000 |
| commit | 153fde544bda6429a63360c9403f3ea3883a7497 (patch) | |
| tree | 9ce76ad60a18c3c6ec4698ef4bd72fd00f7285e9 | |
| parent | 7757bf99f57b0dbd7a0ed3ac0bb1c55481e6d706 (diff) | |
| download | gchips-153fde544bda6429a63360c9403f3ea3883a7497.tar.gz | |
Revert "Namespace gralloc4"
Revert "Add gralloc switch"
Revert "Namespace gralloc"
Revert "Add gralloc switch"
Revert "Namespace gralloc"
Revert "Namespace gralloc"
Revert "Gralloc - Update build rules with namespaces"
Revert "Gralloc - Update build rules with namespaces"
Revert "Namespace gralloc"
Revert submission 16356594-pixel-gralloc-build
Reason for revert: Breaks build_test2 target on master
BUGID: b/213540102
Reverted Changes:
Ia998ca7f1:Namespace gralloc
I644f46ade:Add gralloc switch
I3689a27c2:Namespace gralloc
Iea1bf2ce2:Clone gralloc4 to GrallocHAL
I083cfa4f0:Namespace gralloc4
If8c40cd13:Namespace gralloc
I464236fea:Namespace gralloc
Icaac6d24f:Add gralloc switch
I92b7212b8:Gralloc - Update build rules with namespaces
Ic8741d4ba:Gralloc - Update build rules with namespaces
I507cbbc73:Namespace gralloc
Change-Id: I1abfa62169515a08bf6cabc74626a6df5f697aa7
| -rw-r--r-- | Android.bp | 6 | ||||
| -rw-r--r-- | gralloc4/Android.bp | 7 | ||||
| -rw-r--r-- | libvendorgraphicbuffer/Android.bp | 4 |
3 files changed, 2 insertions, 15 deletions
@@ -1,9 +1,5 @@ soong_namespace { - imports: [ - "hardware/google/graphics/common", - "hardware/google/gchips/gralloc4", - "hardware/google/gchips/GrallocHAL", - ] + imports: ["hardware/google/graphics/common"] } package { diff --git a/gralloc4/Android.bp b/gralloc4/Android.bp index bbac925..c30c359 100644 --- a/gralloc4/Android.bp +++ b/gralloc4/Android.bp @@ -15,13 +15,6 @@ * 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 53e76aa..228d0c1 100644 --- a/libvendorgraphicbuffer/Android.bp +++ b/libvendorgraphicbuffer/Android.bp @@ -42,10 +42,8 @@ cc_library_shared { "libgralloctypes", "libhidlbase", ], - header_libs: [ - "libgralloc_headers", - ], include_dirs: [ + "hardware/google/gchips/gralloc4/src", "hardware/google/gchips/include", ], export_include_dirs: [ |