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

Commit b6faae9f authored by Sarp Misoglu's avatar Sarp Misoglu
Browse files

Move transport client code back to the main target 

In ag/9433204 this code was separated into its own library for a feature
that was cancelled. It doesn't make sense to keep it separate anymore.

Test: m
  atest BackupTransportClientTest.java
  atest CtsBackupHostTestCases
Bug: 210083465
Change-Id: I6b5a6bb45563c16b359f0281aac2c28bce03a6fd
parent 2d8b102e

services/backup/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -19,5 +19,5 @@ java_library_static { 
    defaults: ["platform_service_defaults"],

    srcs: [":services.backup-sources"],

    libs: ["services.core"],

    static_libs: ["backuplib", "app-compat-annotations"],

    static_libs: ["app-compat-annotations"],

}

services/backup/backuplib/Android.bp

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "frameworks_base_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_base_license"],

}



filegroup {

    name: "backuplib-sources",

    srcs: ["java/**/*.java"],

    path: "java",

    visibility: ["//frameworks/base/services"],

}



java_library {

    name: "backuplib",

    srcs: [":backuplib-sources"],

    libs: ["services.core"],

}

services/backup/backuplib/java/com/android/server/backup/transport/BackupTransportClient.java→services/backup/java/com/android/server/backup/transport/BackupTransportClient.java

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 * Copyright (C) 2022 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.

services/backup/backuplib/java/com/android/server/backup/transport/OnTransportRegisteredListener.java→services/backup/java/com/android/server/backup/transport/OnTransportRegisteredListener.java

+0 −0

File moved.

View file