1 files changed, 4 insertions, 90 deletions

diff --git a/fastboot/Android.bp b/fastboot/Android.bp
index 2c70778ae..cf0f1ac93 100644
--- a/fastboot/Android.bp
+++ b/fastboot/Android.bp
@@ -14,34 +14,6 @@
 
 // This is required because no Android.bp can include a library defined in an
 // Android.mk. Eventually should kill libfastboot (defined in Android.mk)
-package {
-    default_applicable_licenses: ["system_core_fastboot_license"],
-}
-
-// Added automatically by a large-scale-change that took the approach of
-// 'apply every license found to every target'. While this makes sure we respect
-// every license restriction, it may not be entirely correct.
-//
-// e.g. GPL in an MIT project might only apply to the contrib/ directory.
-//
-// Please consider splitting the single license below into multiple licenses,
-// taking care not to lose any license_kind information, and overriding the
-// default license using the 'licenses: [...]' property on targets as needed.
-//
-// For unused files, consider creating a 'fileGroup' with "//visibility:private"
-// to attach the license to, and including a comment whether the files may be
-// used in the current project.
-// See: http://go/android-license-faq
-license {
-    name: "system_core_fastboot_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-        "SPDX-license-identifier-BSD",
-    ],
-    // large-scale-change unable to identify any license_text files
-}
-
 cc_library_host_static {
     name: "libfastboot2",
 
@@ -55,7 +27,6 @@ cc_library_host_static {
         "tcp.cpp",
         "udp.cpp",
         "util.cpp",
-        "vendor_boot_img_utils.cpp",
         "fastboot_driver.cpp",
     ],
 
@@ -76,9 +47,7 @@ cc_library_host_static {
     ],
 
     header_libs: [
-        "avb_headers",
         "bootimg_headers",
-        "libstorage_literals_headers",
     ],
 
     export_header_lib_headers: [
@@ -127,7 +96,6 @@ cc_defaults {
         "-Wextra",
         "-Werror",
         "-Wvla",
-        "-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION",
     ],
     rtti: true,
 
@@ -142,12 +110,6 @@ cc_binary {
 
     recovery: true,
 
-    product_variables: {
-        debuggable: {
-            cppflags: ["-DFB_ENABLE_FETCH"],
-        },
-    },
-
     srcs: [
         "device/commands.cpp",
         "device/fastboot_device.cpp",
@@ -164,7 +126,7 @@ cc_binary {
     shared_libs: [
         "android.hardware.boot@1.0",
         "android.hardware.boot@1.1",
-        "android.hardware.fastboot@1.1",
+        "android.hardware.fastboot@1.0",
         "android.hardware.health@2.0",
         "libasyncio",
         "libbase",
@@ -183,19 +145,15 @@ cc_binary {
     ],
 
     static_libs: [
-        "libc++fs",
+        "libgtest_prod",
         "libhealthhalutils",
-        "libsnapshot_cow",
         "libsnapshot_nobinder",
-        "update_metadata-protos",
     ],
 
     header_libs: [
         "avb_headers",
-        "libgtest_prod_headers",
         "libsnapshot_headers",
-        "libstorage_literals_headers",
-    ],
+    ]
 }
 
 cc_defaults {
@@ -208,8 +166,6 @@ cc_defaults {
         "-Wextra",
         "-Werror",
         "-Wunreachable-code",
-        "-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION",
-        "-D_FILE_OFFSET_BITS=64"
     ],
 
     target: {
@@ -276,26 +232,15 @@ cc_library_host_static {
         "tcp.cpp",
         "udp.cpp",
         "util.cpp",
-        "vendor_boot_img_utils.cpp",
         "fastboot_driver.cpp",
     ],
 
     // Only version the final binaries
     use_version_lib: false,
     static_libs: ["libbuildversion"],
-    header_libs: [
-        "avb_headers",
-        "libstorage_literals_headers",
-    ],
 
     generated_headers: ["platform_tools_version"],
 
-    tidy_flags: [
-        // DO NOT add quotes around header-filter flag regex argument,
-        // because build/soong will add quotes around the whole flag.
-        "-header-filter=(system/core/fastboot/|development/host/windows/usb/api/)",
-    ],
-
     target: {
         windows: {
             srcs: ["usb_windows.cpp"],
@@ -305,7 +250,7 @@ cc_library_host_static {
         darwin: {
             srcs: ["usb_osx.cpp"],
         },
-        linux: {
+        linux_glibc: {
             srcs: ["usb_linux.cpp"],
         },
     },
@@ -325,7 +270,6 @@ cc_binary_host {
     required: [
         "mke2fs",
         "make_f2fs",
-        "make_f2fs_casefold",
     ],
     dist: {
         targets: [
@@ -378,33 +322,3 @@ cc_test_host {
         },
     },
 }
-
-cc_test_host {
-    name: "fastboot_vendor_boot_img_utils_test",
-    srcs: ["vendor_boot_img_utils_test.cpp"],
-    static_libs: [
-        "libbase",
-        "libc++fs",
-        "libfastboot",
-        "libgmock",
-        "liblog",
-    ],
-    header_libs: [
-        "avb_headers",
-        "bootimg_headers",
-    ],
-    cflags: [
-        "-Wall",
-        "-Werror",
-    ],
-    data: [
-        ":fastboot_test_dtb",
-        ":fastboot_test_bootconfig",
-        ":fastboot_test_vendor_ramdisk_none",
-        ":fastboot_test_vendor_ramdisk_platform",
-        ":fastboot_test_vendor_ramdisk_replace",
-        ":fastboot_test_vendor_boot_v3",
-        ":fastboot_test_vendor_boot_v4_without_frag",
-        ":fastboot_test_vendor_boot_v4_with_frag"
-    ],
-}