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

Commit 4bbaa847 authored by Neha Pattan's avatar Neha Pattan Committed by Automerger Merge Worker
Browse files

Merge "Remove *nonpublic_deps which was added pre-Rb announcement." into tm-dev am: 0469e1ae 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17056892

Change-Id: I0dcdda2b26d10fa2e2292dc031d25fc1f57530a2
parents b202b389 0469e1ae

Android.bp

+1 −13
Original line number Diff line number Diff line
@@ -25,18 +25,6 @@ 
//

// READ ME: ########################################################



// TODO(b/21090328): Remove filter after we are ready to.

soong_config_module_type {

    name: "java_library_with_nonpublic_deps",

    module_type: "java_library",

    config_namespace: "ANDROID",

    bool_variables: ["include_nonpublic_framework_api"],

    properties: [

        "static_libs",

        "libs",

    ],

}



package {

    default_applicable_licenses: ["frameworks_base_license"],

}
@@ -151,7 +139,7 @@ filegroup { 
    ],

}



java_library_with_nonpublic_deps {

java_library {

    name: "framework-all",

    installable: false,

    static_libs: [

StubLibraries.bp

+6 −14
Original line number Diff line number Diff line
@@ -23,14 +23,6 @@ 
// and comparing them against the checked in API signature, and also checking compatibility

// with the latest frozen API signature.



// TODO(b/21090328): Remove filter after we are ready to.

soong_config_module_type_import {

    from: "frameworks/base/Android.bp",

    module_types: [

        "java_library_with_nonpublic_deps",

    ],

}



/////////////////////////////////////////////////////////////////////

// These modules provide source files for the stub libraries

/////////////////////////////////////////////////////////////////////
@@ -232,7 +224,7 @@ java_defaults { 
    visibility: ["//visibility:private"],

}



java_library_with_nonpublic_deps {

java_library {

    name: "android-non-updatable.stubs",

    defaults: ["android-non-updatable_defaults_stubs_current"],

    srcs: [":api-stubs-docs-non-updatable"],
@@ -242,7 +234,7 @@ java_library_with_nonpublic_deps { 
    },

}



java_library_with_nonpublic_deps {

java_library {

    name: "android-non-updatable.stubs.system",

    defaults: ["android-non-updatable_defaults_stubs_current"],

    srcs: [":system-api-stubs-docs-non-updatable"],
@@ -270,7 +262,7 @@ java_library { 
    },

}



java_library_with_nonpublic_deps {

java_library {

    name: "android-non-updatable.stubs.test",

    defaults: ["android-non-updatable_defaults_stubs_current"],

    srcs: [":test-api-stubs-docs-non-updatable"],
@@ -290,7 +282,7 @@ java_defaults { 
    defaults_visibility: ["//frameworks/base/services"],

}



java_library_with_nonpublic_deps {

java_library {

    name: "android_stubs_current",

    static_libs: [

        "all-modules-public-stubs",
@@ -300,7 +292,7 @@ java_library_with_nonpublic_deps { 
    defaults: ["android.jar_defaults"],

}



java_library_with_nonpublic_deps {

java_library {

    name: "android_system_stubs_current",

    static_libs: [

        "all-modules-system-stubs",
@@ -324,7 +316,7 @@ java_library_with_nonpublic_deps { 
    ],

}



java_library_with_nonpublic_deps {

java_library {

    name: "android_test_stubs_current",

    // Modules do not have test APIs, but we want to include their SystemApis, like we include

    // the SystemApi of framework-non-updatable-sources.

api/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -129,9 +129,6 @@ combined_apis { 
        "framework-wifi",

        "i18n.module.public.api",

    ],

    conditional_bootclasspath: [

        "framework-auxiliary",

    ],

    system_server_classpath: [

        "service-media-s",

        "service-permission",