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

Commit 4aed3703 authored by Jihoon Kang's avatar Jihoon Kang Committed by Gerrit Code Review
Browse files

Merge changes Idc77d018,I7dff0094 

* changes:
  Enable java_api_library modules in TxtStubLibraries.bp
  Add missing dependency in create_mock_soong
parents 634692f1 b34bb067

java/core-libraries/TxtStubLibraries.bp

+0 −20
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ java_system_modules { 
    libs: [

        "core-current-stubs-for-system-modules-no-annotations.from-text",

    ],

    // TODO: Enable after stub generation from .txt file is available

    enabled: false,

}



java_library {
@@ -36,8 +34,6 @@ java_library { 
        "core.current.stubs.from-text",

        "core-lambda-stubs.from-text",

    ],

    // TODO: Enable after stub generation from .txt file is available

    enabled: false,

}



// Same as core-module-lib-stubs-system-modules, but the stubs are generated from .txt files
@@ -47,8 +43,6 @@ java_system_modules { 
    libs: [

        "core-module-lib-stubs-for-system-modules-no-annotations.from-text",

    ],

    // TODO: Enable after stub generation from .txt file is available

    enabled: false,

}



java_library {
@@ -61,8 +55,6 @@ java_library { 
        "core.module_lib.stubs.from-text",

        "core-lambda-stubs.from-text",

    ],

    // TODO: Enable after stub generation from .txt file is available

    enabled: false,

}



java_library {
@@ -79,8 +71,6 @@ java_library { 
    sdk_version: "none",

    system_modules: "none",

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

    // TODO: Enable after stub generation from .txt file is available

    enabled: false,

}



// Same as legacy-core-platform-api-stubs-system-modules, but the stubs are generated from .txt files
@@ -91,8 +81,6 @@ java_system_modules { 
        "legacy.core.platform.api.no.annotations.stubs.from-text",

        "core-lambda-stubs.from-text",

    ],

    // TODO: Enable after stub generation from .txt file is available

    enabled: false,

}



java_library {
@@ -108,8 +96,6 @@ java_library { 
        "legacy.core.platform.api.stubs.from-text",

    ],

    patch_module: "java.base",

    // TODO: Enable after stub generation from .txt file is available

    enabled: false,

}



// Same as stable-core-platform-api-stubs-system-modules, but the stubs are generated from .txt files
@@ -120,8 +106,6 @@ java_system_modules { 
        "stable.core.platform.api.no.annotations.stubs.from-text",

        "core-lambda-stubs.from-text",

    ],

    // TODO: Enable after stub generation from .txt file is available

    enabled: false,

}



java_library {
@@ -137,8 +121,6 @@ java_library { 
        "stable.core.platform.api.stubs.from-text",

    ],

    patch_module: "java.base",

    // TODO: Enable after stub generation from .txt file is available

    enabled: false,

}



java_api_library {
@@ -151,6 +133,4 @@ java_api_library { 
        // LambdaMetaFactory depends on CallSite etc. which is part of the Core API surface

        "core.current.stubs.from-text",

    ],

    // TODO: Enable after stub generation from .txt file is available

    enabled: false,

}

tests/lib.sh

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ function create_mock_soong { 
  symlink_directory external/python

  symlink_directory external/sqlite

  symlink_directory external/spdx-tools

  symlink_directory libcore



  touch "$MOCK_TOP/Android.bp"

}