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

Commit 98bb5a14 authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE - Merge Android 13 

Bug: 242648940
Merged-In: I2d525d59c24df63429ef090e41e45952506c1c59
Change-Id: I2a6d4e66fb340c995bf4a004f22bd44ddeae6267
parents f6e47073 ca9ea94b

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__arm_CtsShimPriv_apk.asciipb

+2 −2
Original line number Diff line number Diff line 
drops {

  android_build_drop {

    build_id: "7552332"

    build_id: "8572644"

    target: "CtsShim"

    source_file: "aosp_arm64/CtsShimPriv.apk"

  }
@@ -8,7 +8,7 @@ drops { 
  version: ""

  version_group: ""

  git_project: "platform/frameworks/base"

  git_branch: "sc-dev"

  git_branch: "tm-dev"

  transform: TRANSFORM_NONE

  transform_options {

  }

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__arm_CtsShim_apk.asciipb

+2 −2
Original line number Diff line number Diff line 
drops {

  android_build_drop {

    build_id: "7552332"

    build_id: "8572644"

    target: "CtsShim"

    source_file: "aosp_arm64/CtsShim.apk"

  }
@@ -8,7 +8,7 @@ drops { 
  version: ""

  version_group: ""

  git_project: "platform/frameworks/base"

  git_branch: "sc-dev"

  git_branch: "tm-dev"

  transform: TRANSFORM_NONE

  transform_options {

  }

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__x86_CtsShimPriv_apk.asciipb

+2 −2
Original line number Diff line number Diff line 
drops {

  android_build_drop {

    build_id: "7552332"

    build_id: "8572644"

    target: "CtsShim"

    source_file: "aosp_x86_64/CtsShimPriv.apk"

  }
@@ -8,7 +8,7 @@ drops { 
  version: ""

  version_group: ""

  git_project: "platform/frameworks/base"

  git_branch: "sc-dev"

  git_branch: "tm-dev"

  transform: TRANSFORM_NONE

  transform_options {

  }

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__x86_CtsShim_apk.asciipb

+2 −2
Original line number Diff line number Diff line 
drops {

  android_build_drop {

    build_id: "7552332"

    build_id: "8572644"

    target: "CtsShim"

    source_file: "aosp_x86_64/CtsShim.apk"

  }
@@ -8,7 +8,7 @@ drops { 
  version: ""

  version_group: ""

  git_project: "platform/frameworks/base"

  git_branch: "sc-dev"

  git_branch: "tm-dev"

  transform: TRANSFORM_NONE

  transform_options {

  }

Android.bp

+24 −9
Original line number Diff line number Diff line
@@ -96,8 +96,11 @@ filegroup { 
        ":platform-compat-native-aidl",



        // AIDL sources from external directories

        ":android.hardware.gnss-V2-java-source",

        ":android.hardware.graphics.common-V3-java-source",

        ":android.hardware.security.keymint-V2-java-source",

        ":android.hardware.security.secureclock-V1-java-source",

        ":android.hardware.tv.tuner-V1-java-source",

        ":android.security.apc-java-source",

        ":android.security.authorization-java-source",

        ":android.security.legacykeystore-java-source",
@@ -117,10 +120,10 @@ filegroup { 
        ":installd_aidl",

        ":libaudioclient_aidl",

        ":libbinder_aidl",

        ":libbluetooth-binder-aidl",

        ":libcamera_client_aidl",

        ":libcamera_client_framework_aidl",

        ":libupdate_engine_aidl",

        ":logd_aidl",

        ":resourcemanager_aidl",

        ":storaged_aidl",

        ":vold_aidl",
@@ -198,6 +201,7 @@ java_library { 
        "android.hardware.contexthub-V1.0-java",

        "android.hardware.contexthub-V1.1-java",

        "android.hardware.contexthub-V1.2-java",

        "android.hardware.contexthub-V1-java",

        "android.hardware.gnss-V1.0-java",

        "android.hardware.gnss-V2.1-java",

        "android.hardware.health-V1.0-java-constants",
@@ -219,8 +223,6 @@ java_library { 
        "android.hardware.thermal-V1.1-java",

        "android.hardware.thermal-V2.0-java",

        "android.hardware.tv.input-V1.0-java-constants",

        "android.hardware.tv.tuner-V1.0-java-constants",

        "android.hardware.tv.tuner-V1.1-java-constants",

        "android.hardware.usb-V1.0-java-constants",

        "android.hardware.usb-V1.1-java-constants",

        "android.hardware.usb-V1.2-java-constants",
@@ -258,7 +260,6 @@ java_defaults { 
    defaults: ["framework-aidl-export-defaults"],

    srcs: [

        ":framework-non-updatable-sources",

        ":framework-bluetooth-sources", // TODO(b/214988855) : Remove once framework-bluetooth jar is ready

        "core/java/**/*.logtags",

        ":apex-info-list",

    ],
@@ -270,8 +271,10 @@ java_defaults { 
        include_dirs: [

            "frameworks/av/aidl",

            "frameworks/native/libs/permission/aidl",

            "packages/modules/Bluetooth/framework/aidl-export",

            "packages/modules/Connectivity/framework/aidl-export",

            "packages/modules/Media/apex/aidl/stable",

            "hardware/interfaces/graphics/common/aidl",

        ],

    },

    dxflags: [
@@ -286,8 +289,12 @@ java_defaults { 
        "error_prone_android_framework",

    ],

    required: [

        // TODO(b/120066492): remove default_television.xml when the build system

        // propagates "required" properly.

        "default_television.xml",

        "framework-platform-compat-config",

        // TODO: remove gps_debug and protolog.conf.json when the build system propagates "required" properly.

        // TODO(b/120066492): remove gps_debug and protolog.conf.json when the build

        // system propagates "required" properly.

        "gps_debug.conf",

        "icu4j-platform-compat-config",

        "protolog.conf.json.gz",
@@ -306,6 +313,9 @@ java_defaults { 
    ],

    sdk_version: "core_platform",

    static_libs: [

        "android.hardware.common.fmq-V1-java",

        // TODO(b/184162091)

        "android.hardware.soundtrigger3-V1-java",

        "bouncycastle-repackaged-unbundled",

        "framework-internal-utils",

        // If MimeMap ever becomes its own APEX, then this dependency would need to be removed
@@ -314,10 +324,12 @@ java_defaults { 
        "av-types-aidl-java",

        "tv_tuner_resource_manager_aidl_interface-java",

        "soundtrigger_middleware-aidl-java",

        "modules-utils-build",

        "modules-utils-preconditions",

        "modules-utils-statemachine",

        "modules-utils-synchronous-result-receiver",

        "modules-utils-os",

        "modules-utils-uieventlogger-interface",

        "framework-permission-aidl-java",

        "spatializer-aidl-java",

        "audiopolicy-types-aidl-java",
@@ -334,12 +346,14 @@ java_library { 
    visibility: [

        "//frameworks/base",

        // TODO(b/147128803) remove the below lines

        "//frameworks/base/apex/appsearch/framework",

        "//frameworks/base/apex/blobstore/framework",

        "//frameworks/base/apex/jobscheduler/framework",

        "//frameworks/base/packages/Tethering/tests/unit",

        "//packages/modules/Connectivity/Tethering/tests/unit",

    ],

    lint: {

        extra_check_modules: ["AndroidFrameworkLintChecker"],

    },

    errorprone: {

        javacflags: [

            "-Xep:AndroidFrameworkBinderIdentity:ERROR",
@@ -371,7 +385,6 @@ java_library { 
    static_libs: [

        "app-compat-annotations",

        "framework-minus-apex",

        "framework-appsearch.impl", // TODO(b/146218515): should be removed

        "framework-updatable-stubs-module_libs_api",

    ],

    sdk_version: "core_platform",
@@ -518,7 +531,10 @@ stubs_defaults { 
        include_dirs: [

            "frameworks/av/aidl",

            "frameworks/native/libs/permission/aidl",

            "packages/modules/Bluetooth/framework/aidl-export",

            "packages/modules/Connectivity/framework/aidl-export",

            "packages/modules/Media/apex/aidl/stable",

            "hardware/interfaces/graphics/common/aidl",

        ],

    },

    // These are libs from framework-internal-utils that are required (i.e. being referenced)
@@ -533,8 +549,6 @@ stubs_defaults { 
        "android.hardware.thermal-V1.0-java-constants",

        "android.hardware.thermal-V2.0-java",

        "android.hardware.tv.input-V1.0-java-constants",

        "android.hardware.tv.tuner-V1.0-java-constants",

        "android.hardware.tv.tuner-V1.1-java-constants",

        "android.hardware.usb-V1.0-java-constants",

        "android.hardware.usb-V1.1-java-constants",

        "android.hardware.usb.gadget-V1.0-java",
@@ -557,6 +571,7 @@ stubs_defaults { 
    name: "module-classpath-stubs-defaults",

    aidl: {

        include_dirs: [

            "packages/modules/Bluetooth/framework/aidl-export",

            "packages/modules/Connectivity/framework/aidl-export",

            "packages/modules/Media/apex/aidl/stable",

        ],