diff options
| author | Roman Stratiienko <r.stratiienko@gmail.com> | 2021-02-27 22:08:51 +0200 |
|---|---|---|
| committer | Roman Stratiienko <r.stratiienko@gmail.com> | 2021-03-03 12:14:14 +0200 |
| commit | d6659983335082d4b54ee006626a1ebc29423bcc (patch) | |
| tree | ea551fdfcc1d64157b497fae7af2bd641bee2df3 | |
| parent | d518a0594a3535a450128102163529e1f319fb37 (diff) | |
| download | drm_hwcomposer-d6659983335082d4b54ee006626a1ebc29423bcc.tar.gz | |
drm_hwcomposer: CI: Use bpfmt to check Android.bp files style
Fix available errors by executing:
$ find -name "*.bp" -exec bpfmt -d -s -w {} \;
Suggested-by: Marijn Suijten <marijn.suijten@somainline.org>
Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
| -rwxr-xr-x | .ci/.gitlab-ci-checkcommit.sh | 6 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | Android.bp | 9 | ||||
| -rw-r--r-- | tests/Android.bp | 2 |
4 files changed, 14 insertions, 7 deletions
diff --git a/.ci/.gitlab-ci-checkcommit.sh b/.ci/.gitlab-ci-checkcommit.sh index 314238f..817afa7 100755 --- a/.ci/.gitlab-ci-checkcommit.sh +++ b/.ci/.gitlab-ci-checkcommit.sh @@ -55,4 +55,10 @@ git log --pretty='%h' FETCH_HEAD..HEAD | while read h; do cat /tmp/format-fixup.patch >&2 exit 1 fi + + find -name "*.bp" -exec bpfmt -d -s {} \; > /tmp/bpfmt.patch + if [ -s /tmp/bpfmt.patch ]; then + cat /tmp/bpfmt.patch >&2 + exit 1 + fi done diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 63cedb6..7fd7367 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,8 @@ -image: ubuntu:20.04 +image: ubuntu:20.10 before_script: - apt-get --quiet update --yes >/dev/null - - apt-get --quiet install --yes clang-11 clang-tidy-11 clang-format-11 git libdrm-dev >/dev/null + - apt-get --quiet install --yes clang-11 clang-tidy-11 clang-format-11 git libdrm-dev blueprint-tools >/dev/null stages: - build @@ -21,8 +21,8 @@ cc_library_static { srcs: ["utils/Worker.cpp"], include_dirs: [ - "external/drm_hwcomposer/include", "external/drm_hwcomposer", + "external/drm_hwcomposer/include", ], cflags: [ @@ -52,8 +52,8 @@ cc_defaults { ], include_dirs: [ - "external/drm_hwcomposer/include", "external/drm_hwcomposer", + "external/drm_hwcomposer/include", ], static_libs: ["libdrmhwc_utils"], @@ -64,8 +64,8 @@ cc_defaults { ], cppflags: [ - "-DHWC2_USE_CPP11", "-DHWC2_INCLUDE_STRINGIFICATION", + "-DHWC2_USE_CPP11", ], product_variables: { @@ -77,6 +77,7 @@ cc_defaults { relative_install_path: "hw", vendor: true, } + cc_library_static { name: "drm_hwcomposer", defaults: ["hwcomposer.drm_defaults"], @@ -105,9 +106,9 @@ cc_library_static { "utils/autolock.cpp", "utils/hwcutils.cpp", - "backend/BackendManager.cpp", "backend/Backend.cpp", "backend/BackendClient.cpp", + "backend/BackendManager.cpp", "backend/BackendRCarDu.cpp", ], } diff --git a/tests/Android.bp b/tests/Android.bp index 3bb494a..e30898c 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -29,7 +29,7 @@ cc_test { static_libs: ["libdrmhwc_utils"], shared_libs: ["hwcomposer.drm"], include_dirs: [ - "external/drm_hwcomposer/include", "external/drm_hwcomposer", + "external/drm_hwcomposer/include", ], } |