Skip to content

Commit

Permalink
FP3: Fix bootctrl
Browse files Browse the repository at this point in the history
FP3: Build bootctrl using Soong

This is required to build the recovery variant of the
same to be used by fastbootd.

Bug: 78793464
Test: make
Bug: 34254109
Change-Id: I16eddcb853bda1a9969810f258884ebdbbfc1f5c
Merged-In: I16eddcb853bda1a9969810f258884ebdbbfc1f5c
(cherry picked from commit 805edb72d0bca42c59421440a896829e9a30c574)
Signed-off-by: Sevenrock <[email protected]>
Signed-off-by: Joshua Blanchard <[email protected]>

FP3: gpt-utils: merge in LA.UM.8.6.2.r1-07600-89xx.0

* from https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/recovery-ext/log/?h=LA.UM.8.6.2.r1-07600-89xx.0

Change-Id: Ic703489d28f34514b38990a7fac879103ba49710

FP3: gpt-utils: Build libgptutils with Android.bp

This is required to build bootctrl.msm8953 with Android.bp.

Bug: 78793464
Test: make

Change-Id: Iff4f50ad363cc003d60a5380addd79749b547514
Signed-off-by: Joshua Blanchard <[email protected]>

FP3: gpt-utils: Add debug messages and fix format warnings

Bug: 30125830
Change-Id: Ic0965f7b516fadf2dee9fcc494a5868a979ac61b

FP3: gpt-utils: Address the warnings

[ 11% 2/18] target  C++: libgptutils <= device/google/crosshatch/gpt-utils/gpt-utils.cpp
In file included from device/google/crosshatch/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]
 ^
device/google/crosshatch/gpt-utils/gpt-utils.cpp:750:17: warning: unused variable 'ufs_dir_stat' [-Wunused-variable]
    struct stat ufs_dir_stat;
                ^
device/google/crosshatch/gpt-utils/gpt-utils.cpp:973:13: warning: unused variable 'r' [-Wunused-variable]
        int r, fd;
            ^
device/google/crosshatch/gpt-utils/gpt-utils.cpp:973:16: warning: unused variable 'fd' [-Wunused-variable]
        int r, fd;
               ^
4 warnings generated.

Test: lunch blueline-userdebug && m -j libgptutils
Change-Id: Idd9174276d8a5b7b77c2ec48c745a78184f65fcf

FP3: gpt-utils: Drop unnecessary include

* When using generated_kernel_headers including
  asm/byteorder.h will cause a warning due to
  unused static functions.

Change-Id: I2a74ec92487c13c4645048c96da8cb92b3cbd9f0

Co-authored-by: Hridya Valsaraju <[email protected]>
Co-authored-by: Sooraj Sizon <[email protected]>
Co-authored-by: Sivaram Vempati <[email protected]>
Co-authored-by: Tao Bao <[email protected]>
Co-authored-by: Łukasz Patron <[email protected]>
Change-Id: Ibfde2eaba49499ecf9a2032c6e58d71d9977fb1d
  • Loading branch information
6 people committed Jun 6, 2023
1 parent 76d2f52 commit afb9f82
Show file tree
Hide file tree
Showing 13 changed files with 84 additions and 793 deletions.
23 changes: 23 additions & 0 deletions bootctrl/Android.bp
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
//
// Copyright (C) 2018 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
package {
//default_applicable_licenses: ["Android-Apache-2.0"],
}
cc_library {
name: "bootctrl.msm8953",
defaults: ["bootctrl_hal_defaults"],
static_libs: ["libgptutils.fp3"],
}
32 changes: 0 additions & 32 deletions bootctrl/Android.mk

This file was deleted.

26 changes: 0 additions & 26 deletions bootctrl/NOTICE

This file was deleted.

Loading

0 comments on commit afb9f82

Please sign in to comment.