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

Commit b0f3d42d authored by Spandan Das's avatar Spandan Das
Browse files

Create a defaults module for stripping out annotations 

This reduces code duplication in preparation for checking in a
java_system_modules created using stubs from .txt files

Test: No diff in the 4 java_system_modules
Change-Id: I0a13a0e7bf402cbe8f0dd3942b1f737cc6ac0de7
parent 877f39d5

java/core-libraries/Android.bp

+20 −12
Original line number Diff line number Diff line
@@ -79,16 +79,25 @@ java_library { 
    ],

}



// Defaults module to strip out android annotations

java_defaults {

    name: "system-modules-no-annotations",

    sdk_version: "none",

    system_modules: "none",

    jarjar_rules: "jarjar-strip-annotations-rules.txt",

}



// Same as core-current-stubs-for-system-modules, but android annotations are

// stripped.

java_library {

    name: "core-current-stubs-for-system-modules-no-annotations",

    visibility: ["//development/sdk"],

    defaults: [

        "system-modules-no-annotations",

    ],

    static_libs: [

        "core-current-stubs-for-system-modules",

    ],

    sdk_version: "none",

    system_modules: "none",

    dists: [

        {

            // Legacy dist location for the public file.
@@ -100,7 +109,6 @@ java_library { 
            targets: dist_targets,

        },

    ],

    jarjar_rules: "jarjar-strip-annotations-rules.txt",

}



// Used when compiling higher-level code against core.current.stubs.
@@ -158,16 +166,16 @@ java_library { 
java_library {

    name: "core-module-lib-stubs-for-system-modules-no-annotations",

    visibility: ["//visibility:private"],

    defaults: [

        "system-modules-no-annotations",

    ],

    static_libs: [

        "core-module-lib-stubs-for-system-modules",

    ],

    sdk_version: "none",

    system_modules: "none",

    dist: {

        dest: "system-modules/module-lib/core-for-system-modules-no-annotations.jar",

        targets: dist_targets,

    },

    jarjar_rules: "jarjar-strip-annotations-rules.txt",

}



// Used when compiling higher-level code with sdk_version "module_current"
@@ -212,16 +220,16 @@ java_library { 
java_library {

    name: "legacy.core.platform.api.no.annotations.stubs",

    visibility: core_platform_visibility,

    defaults: [

        "system-modules-no-annotations",

    ],

    hostdex: true,

    compile_dex: true,



    sdk_version: "none",

    system_modules: "none",

    static_libs: [

        "legacy.core.platform.api.stubs",

    ],

    patch_module: "java.base",

    jarjar_rules: "jarjar-strip-annotations-rules.txt",

}



java_library {
@@ -247,16 +255,16 @@ java_library { 
java_library {

    name: "stable.core.platform.api.no.annotations.stubs",

    visibility: core_platform_visibility,

    defaults: [

        "system-modules-no-annotations",

    ],

    hostdex: true,

    compile_dex: true,



    sdk_version: "none",

    system_modules: "none",

    static_libs: [

        "stable.core.platform.api.stubs",

    ],

    patch_module: "java.base",

    jarjar_rules: "jarjar-strip-annotations-rules.txt",

}



// Used when compiling higher-level code against *.core.platform.api.stubs.