Commit Graph

7 Commits

Author SHA1 Message Date
Tao Bao
e28d504d68 taimen: gpt-utils: Deprecate PRODUCT_STATIC_BOOT_CONTROL_HAL
In favor of using boot control HAL under recovery.

Bug: 34254109
Test: TreeHugger

This is a combination of 2 commits.
This is the 1st commit message:

Revert^2 "Build libgptutils with Android.bp.""

This reverts commit 215189f0b9ff44d28c2b4ace0abb26854b201271.

The previous landing broke checkbuild targets due to namespace issue. As
libgptutils.msm8998 was exposed to global namespace (previously guarded
via conditionals in Android.mk), but had a missing dependency on
nonexposed msm8998 kernel headers.

The relanding adds a Soong namespace of hardware/qcom/msm8998, to ensure
modules only getting built as needed.

Bug: 34254109
Test: Sideload on taimen.
Test: `m -j checkbuild` with aosp_x86-eng
Change-Id: I4a7c4cedcf58c7735172d989912e4f7afad1eaed
Merged-In: I4a7c4cedcf58c7735172d989912e4f7afad1eaed
(cherry picked from commit e74c7611d2cbea03ec8ec1559787a7a57b2bf767)

This is the commit message #2:

Revert^2 "Deprecate PRODUCT_STATIC_BOOT_CONTROL_HAL.""

This reverts commit d83c2cc22b3f037e94cd4ad7e19f5985da13a8b8.

The previous landing broke checkbuild targets due to namespace issue.
See the commit message for hardware/qcom/msm8998 change.

Bug: 34254109
Test: Build and boot taimen on device to home screen.
Test: Sideload on taimen.
Change-Id: I775026345eb5fc0ec580ba4ca0282835106a1d35
Merged-In: I775026345eb5fc0ec580ba4ca0282835106a1d35
(cherry picked from commit 4fa8e490208bef42faccf204381dc35ad1cfed46)
2024-06-08 21:20:49 +08:00
Tao Bao
c988a87f71 taimen: gpt-utils: Drop -Wno-unused-variable and address one warning
hardware/qcom/msm8998/gpt-utils/gpt-utils.cpp:750:17: error: unused variable 'ufs_dir_stat' [-Werror,-Wunused-variable]
    struct stat ufs_dir_stat;
                ^
hardware/qcom/msm8998/gpt-utils/gpt-utils.cpp:973:13: error: unused variable 'r' [-Werror,-Wunused-variable]
        int r, fd;
            ^
hardware/qcom/msm8998/gpt-utils/gpt-utils.cpp:973:16: error: unused variable 'fd' [-Werror,-Wunused-variable]
        int r, fd;
               ^
3 errors generated.

[ 22% 4/18] target  C++: libgptutils <= hardware/qcom/msm8998/gpt-utils/gpt-utils.cpp
In file included from hardware/qcom/msm8998/gpt-utils/gpt-utils.cpp:54:
system/core/libcutils/include_vndk/cutils/log.h:38:2: warning: "Deprecated: don't include cutils/log.h, use either android/log.h or log/log.h" [-W#warnings]
 ^
1 warning generated.

Test: lunch aosp_walleye-userdebug && m -j libgptutils
Change-Id: Ie3c33cc61fc62ac93ab0954a9e292b62cfcf9e03
2024-06-08 21:20:49 +08:00
Chih-Hung Hsieh
f79c042214 taimen: gpt-utils: Use -Werror
* Suppress existing warnings.

Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: If2d100b57d6f29a91ed744263aae75714c8b1bff
2024-06-08 21:20:49 +08:00
Logan Chien
d5cbb1b09c taimen: gpt-utils: Replace libsparse.so with libz.so
This commit replaces sparse_crc32() with crc32() from libz.so because
libsparse.so won't be vendor available.

Bug: 38303202
Test: android builds
Change-Id: Ib318da74b5d55f729cbd40d9a62da53e6316fe7b
2024-06-08 21:20:49 +08:00
Isaac Chen
a1223e05c9 taimen: gpt-utils: Move lib to vendor for build split
libgptutils is only used by vendor. Move it to
vendor partition so they can work with generic AOSP
system image.

Bug: 37927875
Test: These libs are under /vendor/lib(64) instead of
/system/lib(64) and the resulted image works on the device.
Change-Id: Id04f7a09fdc8e60de79f83b8fd0c2504fd2e2ebe

Change-Id: I7f3f8fe845d35a05492ffc4785787622c7851b79
2024-06-08 21:20:07 +08:00
Thierry Strudel
d507e418c7 taimen: gpt-utils: Squashed PTN_SWAP_LIST additions
Author: Thierry Strudel <tstrudel@google.com>
Date:   Thu May 4 18:15:01 2017 -0700
    gpt-utils: PTN_SWAP_LIST add the missing new partitions

    abl, dtbo, vbmeta were not part of the list updated by bootctl HAL.
    This will fix the issue but bootctl HAL should be rewritten to not
    detect A/B partition candidate at runtime.

    Bug: 37501587
    Change-Id: I64140d9fce8d142e16a12c9778f1b10394f9dc76
    Signed-off-by: Thierry Strudel <tstrudel@google.com>

Author: Patrick Tjin <pattjin@google.com>
Date:   Tue Jul 25 19:26:1 2017 -0700
    Add aes as A/B OTA partition

    Bug: 37554629
    Change-Id: I162150922683000dbfc0beceab807d46bd51325e

Author: Patrick Tjin <pattjin@google.com>
Date:   Wed May 10 15:36:34 2017 -0700
    Add laf partition to swap list.

    Bug: 37743272
    Change-Id: If9521bbd29af9439aa01ac72c8bb8cbc0bf674b6

Change-Id: I8aa1386206e6b675a4b7d1e696841f23f5955c2d
2024-06-08 21:20:07 +08:00
Thierry Strudel
34c4af49c8 taimen: Adding gpt-utils
Change-Id: Ib39a2dd8319c1b9e5fbbb1fc782237d061046094
Signed-off-by: Thierry Strudel <tstrudel@google.com>
2024-06-08 21:19:46 +08:00