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

Commit 5975f42f authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10897809 from 9f396da6 to 24Q1-release 

Change-Id: I008af94e20c39f331eb889b6364923b05914dbfc
parents 0b3ac28e 9f396da6

AconfigFlags.bp

+28 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ aconfig_srcjars = [ 
    ":display_flags_lib{.generated_srcjars}",

    ":android.multiuser.flags-aconfig-java{.generated_srcjars}",

    ":android.app.flags-aconfig-java{.generated_srcjars}",

    ":android.credentials.flags-aconfig-java{.generated_srcjars}",

    ":android.view.contentprotection.flags-aconfig-java{.generated_srcjars}",

]



filegroup {
@@ -355,3 +357,29 @@ java_aconfig_library { 
    aconfig_declarations: "android.hardware.radio.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Credential Manager

aconfig_declarations {

    name: "android.credentials.flags-aconfig",

    package: "android.credentials.flags",

    srcs: ["core/java/android/credentials/flags.aconfig"],

}



java_aconfig_library {

    name: "android.credentials.flags-aconfig-java",

    aconfig_declarations: "android.credentials.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Content Protection

aconfig_declarations {

    name: "android.view.contentprotection.flags-aconfig",

    package: "android.view.contentprotection.flags",

    srcs: ["core/java/android/view/contentprotection/flags/*.aconfig"],

}



java_aconfig_library {

    name: "android.view.contentprotection.flags-aconfig-java",

    aconfig_declarations: "android.view.contentprotection.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}

api/OWNERS

+4 −1
Original line number Diff line number Diff line
@@ -3,7 +3,10 @@ hansson@google.com 
# Modularization team

file:platform/packages/modules/common:/OWNERS



# Soong plugin owned by Soong team.

per-file *.go,go.mod,go.work,go.work.sum = file:platform/build/soong:/OWNERS



per-file Android.bp = file:platform/build/soong:/OWNERS #{LAST_RESORT_SUGGESTION}



# For metalava team to disable lint checks in platform

per-file Android.bp = aurimas@google.com,emberrose@google.com,sjgilbert@google.com
 
per-file Android.bp = aurimas@google.com,emberrose@google.com

api/StubLibraries.bp

+6 −4
Original line number Diff line number Diff line
@@ -359,13 +359,15 @@ java_library { 
    ],

    srcs: [":module-lib-api-stubs-docs-non-updatable"],

    libs: [

        // We cannot depend on all-modules-module-lib-stubs, because the module-lib stubs

        // depend on this stub. We resolve dependencies on APIs in modules by depending

        // on a prebuilt of the whole platform (sdk_system_current_android).

        // That prebuilt does not include module-lib APIs, so use the prebuilt module-lib

        // stubs for modules that export module-lib stubs that the non-updatable part

        // depends on.

        "sdk_module-lib_current_framework-tethering",

        "sdk_module-lib_current_framework-connectivity-t",

        "sdk_public_current_framework-bluetooth",

        // NOTE: The below can be removed once the prebuilt stub contains bluetooth.

        "sdk_system_current_android",

        // NOTE: The below can be removed once the prebuilt stub contains IKE.

        "sdk_system_current_android.net.ipsec.ike",

    ],

    dist: {

        dir: "apistubs/android/module-lib",

api/go.mod

0 → 100644
+12 −0
Original line number Diff line number Diff line 
module android/soong/aidl



go 1.18



require (

	android/soong v0.0.0

	github.com/google/blueprint v0.0.0

	google.golang.org/protobuf v0.0.0

	prebuilts/bazel/common/proto/analysis_v2 v0.0.0

	prebuilts/bazel/common/proto/build v0.0.0

	go.starlark.net v0.0.0

)

api/go.work

0 → 100644
+19 −0
Original line number Diff line number Diff line 
go 1.18



use (

	.

	../../../build/soong

	../../../build/blueprint

	../../../external/go-cmp

	../../../external/golang-protobuf

)



replace (

	android/soong v0.0.0 => ../../../build/soong

	google.golang.org/protobuf v0.0.0 => ../../../external/golang-protobuf

	github.com/google/blueprint v0.0.0 => ../../../build/blueprint

	github.com/google/go-cmp v0.0.0 => ../../../external/go-cmp

	prebuilts/bazel/common/proto/analysis_v2 v0.0.0 => ../../../prebuilts/bazel/common/proto/analysis_v2

	prebuilts/bazel/common/proto/build v0.0.0 => ../../../prebuilts/bazel/common/proto/build

	go.starlark.net v0.0.0 => ../../../external/starlark-go

)