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

Commit 84918d56 authored by Anton Hansson's avatar Anton Hansson
Browse files

Move build modules from top-level to core/java/ 

The top-level Android.bp is large and difficult to navigate. Move rules
that don't have any "top level" things in them down in the core/java
directory.

Bug: 185128417
Test: m
Merged-In: I3fd90c2d5140e5716474ff1f8c58cbc1b3319e5b
Change-Id: I3fd90c2d5140e5716474ff1f8c58cbc1b3319e5b
parent e93771bf

Android.bp

+0 −274
Original line number Diff line number Diff line
@@ -257,37 +257,6 @@ filegroup { 
    srcs: ["framework-jarjar-rules.txt"],

}



filegroup {

    name: "libincident_aidl",

    srcs: [

        "core/java/android/os/IIncidentDumpCallback.aidl",

        "core/java/android/os/IIncidentManager.aidl",

        "core/java/android/os/IIncidentReportStatusListener.aidl",

    ],

    path: "core/java",

}



filegroup {

    name: "libvibrator_aidl",

    srcs: [

        "core/java/android/os/IExternalVibrationController.aidl",

        "core/java/android/os/IExternalVibratorService.aidl",

    ],

    path: "core/java",

}



filegroup {

    name: "libpowermanager_aidl",

    srcs: [

        "core/java/android/os/Temperature.aidl",

        "core/java/android/os/CoolingDevice.aidl",

        "core/java/android/os/IThermalEventListener.aidl",

        "core/java/android/os/IThermalStatusListener.aidl",

        "core/java/android/os/IThermalService.aidl",

    ],

    path: "core/java",

}



java_library {

    name: "framework-minus-apex",

    defaults: ["framework-aidl-export-defaults"],
@@ -376,26 +345,6 @@ platform_compat_config { 
    src: ":framework-minus-apex",

}



genrule {

    name: "statslog-framework-java-gen",

    tools: ["stats-log-api-gen"],

    cmd: "$(location stats-log-api-gen) --java $(out) --module framework" +

        " --javaPackage com.android.internal.util --javaClass FrameworkStatsLog --worksource",

    out: ["com/android/internal/util/FrameworkStatsLog.java"],

}



java_library {

    name: "uieventloggerlib",

    srcs: [

        "core/java/com/android/internal/logging/UiEvent.java",

        "core/java/com/android/internal/logging/UiEventLogger.java",

        "core/java/com/android/internal/logging/UiEventLoggerImpl.java",

        "core/java/com/android/internal/logging/InstanceId.java",

        "core/java/com/android/internal/logging/InstanceIdSequence.java",

        ":statslog-framework-java-gen",

    ],

}



gensrcs {

    name: "framework-javastream-protos",

    depfile: true,
@@ -528,30 +477,6 @@ filegroup { 
    ],

}



filegroup {

    name: "framework-services-net-module-wifi-shared-srcs",

    srcs: [

        "core/java/android/net/DhcpResults.java",

        "core/java/android/util/LocalLog.java",

    ],

}



// keep these files in sync with the package/Tethering/jarjar-rules.txt and

// package/Connectivity/jarjar-rules.txt for the tethering module and connectivity module.

filegroup {

    name: "framework-connectivity-shared-srcs",

    srcs: [

        "core/java/android/util/LocalLog.java",

        // This should be android.util.IndentingPrintWriter, but it's not available in all branches.

        "core/java/com/android/internal/util/IndentingPrintWriter.java",

        "core/java/com/android/internal/util/IState.java",

        "core/java/com/android/internal/util/MessageUtils.java",

        "core/java/com/android/internal/util/State.java",

        "core/java/com/android/internal/util/StateMachine.java",

        "core/java/com/android/internal/util/WakeupMessage.java",

    ],

}



// Build ext.jar

// ============================================================

java_library {
@@ -733,129 +658,6 @@ cc_library { 
    },

}



filegroup {

    name: "incremental_aidl",

    srcs: [

        "core/java/android/os/incremental/IIncrementalServiceConnector.aidl",

        "core/java/android/os/incremental/IncrementalFileSystemControlParcel.aidl",

    ],

    path: "core/java",

}



filegroup {

    name: "dataloader_aidl",

    srcs: [

        "core/java/android/content/pm/DataLoaderParamsParcel.aidl",

        "core/java/android/content/pm/DataLoaderType.aidl",

        "core/java/android/content/pm/FileSystemControlParcel.aidl",

        "core/java/android/content/pm/IDataLoader.aidl",

        "core/java/android/content/pm/IDataLoaderManager.aidl",

        "core/java/android/content/pm/InstallationFileParcel.aidl",

        "core/java/android/content/pm/InstallationFileLocation.aidl",

        "core/java/android/content/pm/IDataLoaderStatusListener.aidl",

        "core/java/android/content/pm/IPackageInstallerSessionFileSystemConnector.aidl",

    ],

    path: "core/java",

}



filegroup {

    name: "incremental_manager_aidl",

    srcs: [

        "core/java/android/os/incremental/IIncrementalService.aidl",

        "core/java/android/os/incremental/IncrementalNewFileParams.aidl",

        "core/java/android/os/incremental/IStorageHealthListener.aidl",

        "core/java/android/os/incremental/StorageHealthCheckParams.aidl",

    ],

    path: "core/java",

}



filegroup {

    name: "activity_manager_procstate_aidl",

    srcs: [

        // internal only

    ],

    path: "core/java",

}



aidl_interface {

    name: "libincremental_aidl",

    unstable: true,

    srcs: [

        ":incremental_aidl",

    ],

    backend: {

        java: {

            sdk_version: "28",

        },

        cpp: {

            enabled: true,

        },

        ndk: {

            enabled: true,

        },

    },

}



aidl_interface {

    name: "libdataloader_aidl",

    unstable: true,

    srcs: [

        ":dataloader_aidl",

    ],

    imports: [

        "libincremental_aidl",

    ],

    backend: {

        java: {

            sdk_version: "28",

        },

        cpp: {

            enabled: true,

        },

        ndk: {

            enabled: false,

        },

    },

}



aidl_interface {

    name: "libincremental_manager_aidl",

    unstable: true,

    srcs: [

        ":incremental_manager_aidl",

    ],

    imports: [

        "libincremental_aidl",

        "libdataloader_aidl",

    ],

    backend: {

        java: {

            sdk_version: "28",

        },

        cpp: {

            enabled: true,

        },

        ndk: {

            enabled: false,

        },

    },

}



// Build Rust bindings for PermissionController. Needed by keystore2.

aidl_interface {

    name: "android.os.permissions_aidl",

    unstable: true,

    local_include_dir: "core/java",

    srcs: [

        "core/java/android/os/IPermissionController.aidl",

    ],

    backend: {

        rust: {

            enabled: true,

        },

    },

}



python_defaults {

    name: "base_default",

    version: {
@@ -882,55 +684,6 @@ python_binary_host { 
    ],

}



// Avoid including Parcelable classes as we don't want to have two copies of

// Parcelable cross the libraries. This is used by telephony-common (frameworks/opt/telephony)

// and TeleService app (packages/services/Telephony).

filegroup {

    name: "framework-telephony-common-shared-srcs",

    srcs: [

        "core/java/android/os/RegistrantList.java",

        "core/java/android/os/Registrant.java",

        "core/java/android/util/LocalLog.java",

        "core/java/android/util/TimeUtils.java",

        "core/java/com/android/internal/os/SomeArgs.java",

        "core/java/com/android/internal/util/AsyncChannel.java",

        "core/java/com/android/internal/util/AsyncService.java",

        "core/java/com/android/internal/util/BitwiseInputStream.java",

        "core/java/com/android/internal/util/FastXmlSerializer.java",

        "core/java/com/android/internal/util/HexDump.java",

        "core/java/com/android/internal/util/IState.java",

        "core/java/com/android/internal/util/IndentingPrintWriter.java",

        "core/java/com/android/internal/util/Preconditions.java",

        "core/java/com/android/internal/util/State.java",

        "core/java/com/android/internal/util/StateMachine.java",

        "core/java/com/android/internal/util/UserIcons.java",

    ],

}



// Avoid including Parcelable classes as we don't want to have two copies of

// Parcelable cross the process.

filegroup {

    name: "framework-cellbroadcast-shared-srcs",

    srcs: [

        "core/java/android/os/HandlerExecutor.java",

        "core/java/android/util/LocalLog.java",

        "core/java/com/android/internal/util/IState.java",

        "core/java/com/android/internal/util/Preconditions.java",

        "core/java/com/android/internal/util/State.java",

        "core/java/com/android/internal/util/StateMachine.java",

    ],

}



filegroup {

    name: "framework-ims-common-shared-srcs",

    srcs: [

        "core/java/android/os/RegistrantList.java",

        "core/java/android/os/Registrant.java",

        "core/java/com/android/internal/os/SomeArgs.java",

        "core/java/com/android/internal/util/Preconditions.java",

    ],

}



// utility classes statically linked into framework-wifi and dynamically linked

// into wifi-service

java_library {
@@ -959,33 +712,6 @@ java_library { 
    ],

}



filegroup {

    name: "framework-wifi-util-lib-aidls",

    srcs: ["core/java/android/content/pm/ParceledListSlice.aidl"],

    path: "core/java",

}



// utility classes statically linked into wifi-service

filegroup {

    name: "framework-wifi-service-shared-srcs",

    srcs: [

        "core/java/android/net/InterfaceConfiguration.java",

        "core/java/android/util/BackupUtils.java",

        "core/java/android/util/Rational.java",

        "core/java/com/android/internal/util/FastXmlSerializer.java",

        "core/java/com/android/internal/util/HexDump.java",

        "core/java/com/android/internal/util/IState.java",

        "core/java/com/android/internal/util/MessageUtils.java",

        "core/java/com/android/internal/util/State.java",

        "core/java/com/android/internal/util/StateMachine.java",

        "core/java/com/android/internal/util/WakeupMessage.java",

    ],

    visibility: [

        "//frameworks/opt/net/wifi/service",

        "//packages/modules/Wifi/service",

    ],

}



// TODO(b/145644363): move this to under StubLibraries.bp or ApiDocs.bp

metalava_framework_docs_args = "--manifest $(location core/res/AndroidManifest.xml) " +

    "--hide-package com.android.server " +

core/java/Android.bp

+266 −0
Original line number Diff line number Diff line
@@ -127,3 +127,269 @@ filegroup { 
    ],

    visibility: ["//frameworks/base/test-mock"],

}



filegroup {

    name: "libincident_aidl",

    srcs: [

        "android/os/IIncidentDumpCallback.aidl",

        "android/os/IIncidentManager.aidl",

        "android/os/IIncidentReportStatusListener.aidl",

    ],

}



filegroup {

    name: "libvibrator_aidl",

    srcs: [

        "android/os/IExternalVibrationController.aidl",

        "android/os/IExternalVibratorService.aidl",

    ],

}



filegroup {

    name: "libpowermanager_aidl",

    srcs: [

        "android/os/Temperature.aidl",

        "android/os/CoolingDevice.aidl",

        "android/os/IThermalEventListener.aidl",

        "android/os/IThermalStatusListener.aidl",

        "android/os/IThermalService.aidl",

    ],

}



genrule {

    name: "statslog-framework-java-gen",

    tools: ["stats-log-api-gen"],

    cmd: "$(location stats-log-api-gen) --java $(out) --module framework" +

        " --javaPackage com.android.internal.util --javaClass FrameworkStatsLog --worksource",

    out: ["com/android/internal/util/FrameworkStatsLog.java"],

}



java_library {

    name: "uieventloggerlib",

    srcs: [

        "com/android/internal/logging/UiEvent.java",

        "com/android/internal/logging/UiEventLogger.java",

        "com/android/internal/logging/UiEventLoggerImpl.java",

        "com/android/internal/logging/InstanceId.java",

        "com/android/internal/logging/InstanceIdSequence.java",

        ":statslog-framework-java-gen",

    ],

}



filegroup {

    name: "framework-services-net-module-wifi-shared-srcs",

    srcs: [

        "android/net/DhcpResults.java",

        "android/util/LocalLog.java",

    ],

}



// keep these files in sync with the package/Tethering/jarjar-rules.txt and

// package/Connectivity/jarjar-rules.txt for the tethering module and connectivity module.

filegroup {

    name: "framework-connectivity-shared-srcs",

    srcs: [

        "android/util/LocalLog.java",

        // This should be android.util.IndentingPrintWriter, but it's not available in all branches.

        "com/android/internal/util/IndentingPrintWriter.java",

        "com/android/internal/util/IState.java",

        "com/android/internal/util/MessageUtils.java",

        "com/android/internal/util/State.java",

        "com/android/internal/util/StateMachine.java",

        "com/android/internal/util/WakeupMessage.java",

    ],

}



filegroup {

    name: "incremental_aidl",

    srcs: [

        "android/os/incremental/IIncrementalServiceConnector.aidl",

        "android/os/incremental/IncrementalFileSystemControlParcel.aidl",

    ],

}



filegroup {

    name: "dataloader_aidl",

    srcs: [

        "android/content/pm/DataLoaderParamsParcel.aidl",

        "android/content/pm/DataLoaderType.aidl",

        "android/content/pm/FileSystemControlParcel.aidl",

        "android/content/pm/IDataLoader.aidl",

        "android/content/pm/IDataLoaderManager.aidl",

        "android/content/pm/InstallationFileParcel.aidl",

        "android/content/pm/InstallationFileLocation.aidl",

        "android/content/pm/IDataLoaderStatusListener.aidl",

        "android/content/pm/IPackageInstallerSessionFileSystemConnector.aidl",

    ],

}



filegroup {

    name: "incremental_manager_aidl",

    srcs: [

        "android/os/incremental/IIncrementalService.aidl",

        "android/os/incremental/IncrementalNewFileParams.aidl",

        "android/os/incremental/IStorageHealthListener.aidl",

        "android/os/incremental/StorageHealthCheckParams.aidl",

    ],

}



filegroup {

    name: "activity_manager_procstate_aidl",

    srcs: [

        // internal only

    ],

}



aidl_interface {

    name: "libincremental_aidl",

    unstable: true,

    srcs: [

        ":incremental_aidl",

    ],

    backend: {

        java: {

            sdk_version: "28",

        },

        cpp: {

            enabled: true,

        },

        ndk: {

            enabled: true,

        },

    },

}



aidl_interface {

    name: "libdataloader_aidl",

    unstable: true,

    srcs: [

        ":dataloader_aidl",

    ],

    imports: [

        "libincremental_aidl",

    ],

    backend: {

        java: {

            sdk_version: "28",

        },

        cpp: {

            enabled: true,

        },

        ndk: {

            enabled: false,

        },

    },

}



aidl_interface {

    name: "libincremental_manager_aidl",

    unstable: true,

    srcs: [

        ":incremental_manager_aidl",

    ],

    imports: [

        "libincremental_aidl",

        "libdataloader_aidl",

    ],

    backend: {

        java: {

            sdk_version: "28",

        },

        cpp: {

            enabled: true,

        },

        ndk: {

            enabled: false,

        },

    },

}



// Build Rust bindings for PermissionController. Needed by keystore2.

aidl_interface {

    name: "android.os.permissions_aidl",

    unstable: true,

    local_include_dir: ".",

    srcs: [

        "android/os/IPermissionController.aidl",

    ],

    backend: {

        rust: {

            enabled: true,

        },

    },

}



// Avoid including Parcelable classes as we don't want to have two copies of

// Parcelable cross the libraries. This is used by telephony-common (frameworks/opt/telephony)

// and TeleService app (packages/services/Telephony).

filegroup {

    name: "framework-telephony-common-shared-srcs",

    srcs: [

        "android/os/RegistrantList.java",

        "android/os/Registrant.java",

        "android/util/LocalLog.java",

        "android/util/TimeUtils.java",

        "com/android/internal/os/SomeArgs.java",

        "com/android/internal/util/AsyncChannel.java",

        "com/android/internal/util/AsyncService.java",

        "com/android/internal/util/BitwiseInputStream.java",

        "com/android/internal/util/FastXmlSerializer.java",

        "com/android/internal/util/HexDump.java",

        "com/android/internal/util/IState.java",

        "com/android/internal/util/IndentingPrintWriter.java",

        "com/android/internal/util/Preconditions.java",

        "com/android/internal/util/State.java",

        "com/android/internal/util/StateMachine.java",

        "com/android/internal/util/UserIcons.java",

    ],

}



// Avoid including Parcelable classes as we don't want to have two copies of

// Parcelable cross the process.

filegroup {

    name: "framework-cellbroadcast-shared-srcs",

    srcs: [

        "android/os/HandlerExecutor.java",

        "android/util/LocalLog.java",

        "com/android/internal/util/IState.java",

        "com/android/internal/util/Preconditions.java",

        "com/android/internal/util/State.java",

        "com/android/internal/util/StateMachine.java",

    ],

}



filegroup {

    name: "framework-ims-common-shared-srcs",

    srcs: [

        "android/os/RegistrantList.java",

        "android/os/Registrant.java",

        "com/android/internal/os/SomeArgs.java",

        "com/android/internal/util/Preconditions.java",

    ],

}



filegroup {

    name: "framework-wifi-util-lib-aidls",

    srcs: ["android/content/pm/ParceledListSlice.aidl"],

}



// utility classes statically linked into wifi-service

filegroup {

    name: "framework-wifi-service-shared-srcs",

    srcs: [

        "android/net/InterfaceConfiguration.java",

        "android/util/BackupUtils.java",

        "android/util/Rational.java",

        "com/android/internal/util/FastXmlSerializer.java",

        "com/android/internal/util/HexDump.java",

        "com/android/internal/util/IState.java",

        "com/android/internal/util/MessageUtils.java",

        "com/android/internal/util/State.java",

        "com/android/internal/util/StateMachine.java",

        "com/android/internal/util/WakeupMessage.java",

    ],

    visibility: [

        "//frameworks/opt/net/wifi/service",

        "//packages/modules/Wifi/service",

    ],

}