Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e291c23 authored by Thiébaud Weksteen's avatar Thiébaud Weksteen
Browse files

Fix bpfmt issues and add bpfmt to preupload checks 

Test: m nothing
Change-Id: I10526a33685335bdd26cc7692815133379d4e0f6
parent 0c6f111d

Android.bp

+12 −3
Original line number Diff line number Diff line
@@ -106,15 +106,24 @@ toolchain_library { 
        },

        arm64: {

            src: "prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/lib/gcc/aarch64-linux-android/4.9.x/libgcc.a",

            repack_objects_to_keep: ["unwind-dw2.o", "unwind-dw2-fde-dip.o"],

            repack_objects_to_keep: [

                "unwind-dw2.o",

                "unwind-dw2-fde-dip.o",

            ],

        },

        x86: {

            src: "prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/lib/gcc/x86_64-linux-android/4.9.x/32/libgcc.a",

            repack_objects_to_keep: ["unwind-dw2.o", "unwind-dw2-fde-dip.o"],

            repack_objects_to_keep: [

                "unwind-dw2.o",

                "unwind-dw2-fde-dip.o",

            ],

        },

        x86_64: {

            src: "prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/lib/gcc/x86_64-linux-android/4.9.x/libgcc.a",

            repack_objects_to_keep: ["unwind-dw2.o", "unwind-dw2-fde-dip.o"],

            repack_objects_to_keep: [

                "unwind-dw2.o",

                "unwind-dw2-fde-dip.o",

            ],

        },

    },

}

PREUPLOAD.cfg

+1 −0
Original line number Diff line number Diff line 
[Builtin Hooks]

gofmt = true

bpfmt = true

bpfix/Android.bp

+1 −3
Original line number Diff line number Diff line
@@ -50,5 +50,3 @@ bootstrap_go_package { 
        "blueprint-parser",

    ],

}

cmd/extract_apks/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ blueprint_go_binary { 
        "golang-protobuf-proto",

        "soong-cmd-extract_apks-proto",

    ],

    testSrcs: ["main_test.go"]

    testSrcs: ["main_test.go"],

}



bootstrap_go_package {

cmd/extract_jar_packages/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -22,4 +22,3 @@ blueprint_go_binary { 
        "extract_jar_packages.go",

    ],

}