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

Commit ab5ac8f1 authored by Paul Duffin's avatar Paul Duffin
Browse files

Revert "Use glob for java_sdk_library_import stub_srcs" 

This reverts commit 7f97957d.

Reason for revert: breaks sdk snapshots b/173508731
Bug: 173508731
Test: Ran prebuilts/runtime/update.py and then m nothing
      Before revert it failed
      After revert it worked

Change-Id: I9c081681fac589e37788a0d592435e3224011c58
parent 7a64f7e5

java/sdk_library.go

+2 −3
Original line number Diff line number Diff line
@@ -2300,11 +2300,10 @@ func (s *sdkLibrarySdkMemberProperties) AddToPropertySet(ctx android.SdkMemberCo 
			scopeSet.AddProperty("jars", jars)



			// Merge the stubs source jar into the snapshot zip so that when it is unpacked

			// the source files are also unpacked. Use a glob so that if the directory is missing

			// (because there are no stubs sources for this scope) it will not fail.

			// the source files are also unpacked.

			snapshotRelativeDir := filepath.Join(scopeDir, ctx.Name()+"_stub_sources")

			ctx.SnapshotBuilder().UnzipToSnapshot(properties.StubsSrcJar, snapshotRelativeDir)

			scopeSet.AddProperty("stub_srcs", []string{snapshotRelativeDir + "/**/*.java"})

			scopeSet.AddProperty("stub_srcs", []string{snapshotRelativeDir})



			if properties.CurrentApiFile != nil {

				currentApiSnapshotPath := filepath.Join(scopeDir, ctx.Name()+".txt")

sdk/java_sdk_test.go

+28 −28
Original line number Diff line number Diff line
@@ -976,21 +976,21 @@ java_sdk_library_import { 
    shared_library: false,

    public: {

        jars: ["sdk_library/public/myjavalib-stubs.jar"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources"],

        current_api: "sdk_library/public/myjavalib.txt",

        removed_api: "sdk_library/public/myjavalib-removed.txt",

        sdk_version: "current",

    },

    system: {

        jars: ["sdk_library/system/myjavalib-stubs.jar"],

        stub_srcs: ["sdk_library/system/myjavalib_stub_sources/**/*.java"],

        stub_srcs: ["sdk_library/system/myjavalib_stub_sources"],

        current_api: "sdk_library/system/myjavalib.txt",

        removed_api: "sdk_library/system/myjavalib-removed.txt",

        sdk_version: "system_current",

    },

    test: {

        jars: ["sdk_library/test/myjavalib-stubs.jar"],

        stub_srcs: ["sdk_library/test/myjavalib_stub_sources/**/*.java"],

        stub_srcs: ["sdk_library/test/myjavalib_stub_sources"],

        current_api: "sdk_library/test/myjavalib.txt",

        removed_api: "sdk_library/test/myjavalib-removed.txt",

        sdk_version: "test_current",
@@ -1005,21 +1005,21 @@ java_sdk_library_import { 
    shared_library: false,

    public: {

        jars: ["sdk_library/public/myjavalib-stubs.jar"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources"],

        current_api: "sdk_library/public/myjavalib.txt",

        removed_api: "sdk_library/public/myjavalib-removed.txt",

        sdk_version: "current",

    },

    system: {

        jars: ["sdk_library/system/myjavalib-stubs.jar"],

        stub_srcs: ["sdk_library/system/myjavalib_stub_sources/**/*.java"],

        stub_srcs: ["sdk_library/system/myjavalib_stub_sources"],

        current_api: "sdk_library/system/myjavalib.txt",

        removed_api: "sdk_library/system/myjavalib-removed.txt",

        sdk_version: "system_current",

    },

    test: {

        jars: ["sdk_library/test/myjavalib-stubs.jar"],

        stub_srcs: ["sdk_library/test/myjavalib_stub_sources/**/*.java"],

        stub_srcs: ["sdk_library/test/myjavalib_stub_sources"],

        current_api: "sdk_library/test/myjavalib.txt",

        removed_api: "sdk_library/test/myjavalib-removed.txt",

        sdk_version: "test_current",
@@ -1077,7 +1077,7 @@ java_sdk_library_import { 
    shared_library: true,

    public: {

        jars: ["sdk_library/public/myjavalib-stubs.jar"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources"],

        current_api: "sdk_library/public/myjavalib.txt",

        removed_api: "sdk_library/public/myjavalib-removed.txt",

        sdk_version: "none",
@@ -1092,7 +1092,7 @@ java_sdk_library_import { 
    shared_library: true,

    public: {

        jars: ["sdk_library/public/myjavalib-stubs.jar"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources"],

        current_api: "sdk_library/public/myjavalib.txt",

        removed_api: "sdk_library/public/myjavalib-removed.txt",

        sdk_version: "none",
@@ -1146,7 +1146,7 @@ java_sdk_library_import { 
    shared_library: true,

    public: {

        jars: ["sdk_library/public/myjavalib-stubs.jar"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources"],

        current_api: "sdk_library/public/myjavalib.txt",

        removed_api: "sdk_library/public/myjavalib-removed.txt",

        sdk_version: "module_current",
@@ -1161,7 +1161,7 @@ java_sdk_library_import { 
    shared_library: true,

    public: {

        jars: ["sdk_library/public/myjavalib-stubs.jar"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources"],

        current_api: "sdk_library/public/myjavalib.txt",

        removed_api: "sdk_library/public/myjavalib-removed.txt",

        sdk_version: "module_current",
@@ -1218,14 +1218,14 @@ java_sdk_library_import { 
    shared_library: true,

    public: {

        jars: ["sdk_library/public/myjavalib-stubs.jar"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources"],

        current_api: "sdk_library/public/myjavalib.txt",

        removed_api: "sdk_library/public/myjavalib-removed.txt",

        sdk_version: "current",

    },

    system: {

        jars: ["sdk_library/system/myjavalib-stubs.jar"],

        stub_srcs: ["sdk_library/system/myjavalib_stub_sources/**/*.java"],

        stub_srcs: ["sdk_library/system/myjavalib_stub_sources"],

        current_api: "sdk_library/system/myjavalib.txt",

        removed_api: "sdk_library/system/myjavalib-removed.txt",

        sdk_version: "system_current",
@@ -1240,14 +1240,14 @@ java_sdk_library_import { 
    shared_library: true,

    public: {

        jars: ["sdk_library/public/myjavalib-stubs.jar"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources"],

        current_api: "sdk_library/public/myjavalib.txt",

        removed_api: "sdk_library/public/myjavalib-removed.txt",

        sdk_version: "current",

    },

    system: {

        jars: ["sdk_library/system/myjavalib-stubs.jar"],

        stub_srcs: ["sdk_library/system/myjavalib_stub_sources/**/*.java"],

        stub_srcs: ["sdk_library/system/myjavalib_stub_sources"],

        current_api: "sdk_library/system/myjavalib.txt",

        removed_api: "sdk_library/system/myjavalib-removed.txt",

        sdk_version: "system_current",
@@ -1311,21 +1311,21 @@ java_sdk_library_import { 
    shared_library: true,

    public: {

        jars: ["sdk_library/public/myjavalib-stubs.jar"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources"],

        current_api: "sdk_library/public/myjavalib.txt",

        removed_api: "sdk_library/public/myjavalib-removed.txt",

        sdk_version: "current",

    },

    system: {

        jars: ["sdk_library/system/myjavalib-stubs.jar"],

        stub_srcs: ["sdk_library/system/myjavalib_stub_sources/**/*.java"],

        stub_srcs: ["sdk_library/system/myjavalib_stub_sources"],

        current_api: "sdk_library/system/myjavalib.txt",

        removed_api: "sdk_library/system/myjavalib-removed.txt",

        sdk_version: "system_current",

    },

    module_lib: {

        jars: ["sdk_library/module-lib/myjavalib-stubs.jar"],

        stub_srcs: ["sdk_library/module-lib/myjavalib_stub_sources/**/*.java"],

        stub_srcs: ["sdk_library/module-lib/myjavalib_stub_sources"],

        current_api: "sdk_library/module-lib/myjavalib.txt",

        removed_api: "sdk_library/module-lib/myjavalib-removed.txt",

        sdk_version: "module_current",
@@ -1340,21 +1340,21 @@ java_sdk_library_import { 
    shared_library: true,

    public: {

        jars: ["sdk_library/public/myjavalib-stubs.jar"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources"],

        current_api: "sdk_library/public/myjavalib.txt",

        removed_api: "sdk_library/public/myjavalib-removed.txt",

        sdk_version: "current",

    },

    system: {

        jars: ["sdk_library/system/myjavalib-stubs.jar"],

        stub_srcs: ["sdk_library/system/myjavalib_stub_sources/**/*.java"],

        stub_srcs: ["sdk_library/system/myjavalib_stub_sources"],

        current_api: "sdk_library/system/myjavalib.txt",

        removed_api: "sdk_library/system/myjavalib-removed.txt",

        sdk_version: "system_current",

    },

    module_lib: {

        jars: ["sdk_library/module-lib/myjavalib-stubs.jar"],

        stub_srcs: ["sdk_library/module-lib/myjavalib_stub_sources/**/*.java"],

        stub_srcs: ["sdk_library/module-lib/myjavalib_stub_sources"],

        current_api: "sdk_library/module-lib/myjavalib.txt",

        removed_api: "sdk_library/module-lib/myjavalib-removed.txt",

        sdk_version: "module_current",
@@ -1419,14 +1419,14 @@ java_sdk_library_import { 
    shared_library: true,

    public: {

        jars: ["sdk_library/public/myjavalib-stubs.jar"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources"],

        current_api: "sdk_library/public/myjavalib.txt",

        removed_api: "sdk_library/public/myjavalib-removed.txt",

        sdk_version: "current",

    },

    system_server: {

        jars: ["sdk_library/system-server/myjavalib-stubs.jar"],

        stub_srcs: ["sdk_library/system-server/myjavalib_stub_sources/**/*.java"],

        stub_srcs: ["sdk_library/system-server/myjavalib_stub_sources"],

        current_api: "sdk_library/system-server/myjavalib.txt",

        removed_api: "sdk_library/system-server/myjavalib-removed.txt",

        sdk_version: "system_server_current",
@@ -1441,14 +1441,14 @@ java_sdk_library_import { 
    shared_library: true,

    public: {

        jars: ["sdk_library/public/myjavalib-stubs.jar"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources"],

        current_api: "sdk_library/public/myjavalib.txt",

        removed_api: "sdk_library/public/myjavalib-removed.txt",

        sdk_version: "current",

    },

    system_server: {

        jars: ["sdk_library/system-server/myjavalib-stubs.jar"],

        stub_srcs: ["sdk_library/system-server/myjavalib_stub_sources/**/*.java"],

        stub_srcs: ["sdk_library/system-server/myjavalib_stub_sources"],

        current_api: "sdk_library/system-server/myjavalib.txt",

        removed_api: "sdk_library/system-server/myjavalib-removed.txt",

        sdk_version: "system_server_current",
@@ -1508,7 +1508,7 @@ java_sdk_library_import { 
    shared_library: true,

    public: {

        jars: ["sdk_library/public/myjavalib-stubs.jar"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources"],

        current_api: "sdk_library/public/myjavalib.txt",

        removed_api: "sdk_library/public/myjavalib-removed.txt",

        sdk_version: "current",
@@ -1524,7 +1524,7 @@ java_sdk_library_import { 
    shared_library: true,

    public: {

        jars: ["sdk_library/public/myjavalib-stubs.jar"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources"],

        current_api: "sdk_library/public/myjavalib.txt",

        removed_api: "sdk_library/public/myjavalib-removed.txt",

        sdk_version: "current",
@@ -1584,7 +1584,7 @@ java_sdk_library_import { 
    doctag_files: ["doctags/docs/known_doctags"],

    public: {

        jars: ["sdk_library/public/myjavalib-stubs.jar"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources"],

        current_api: "sdk_library/public/myjavalib.txt",

        removed_api: "sdk_library/public/myjavalib-removed.txt",

        sdk_version: "current",
@@ -1600,7 +1600,7 @@ java_sdk_library_import { 
    doctag_files: ["doctags/docs/known_doctags"],

    public: {

        jars: ["sdk_library/public/myjavalib-stubs.jar"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources"],

        current_api: "sdk_library/public/myjavalib.txt",

        removed_api: "sdk_library/public/myjavalib-removed.txt",

        sdk_version: "current",