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

Commit d8e690e0 authored by Cole Faust's avatar Cole Faust Committed by Automerger Merge Worker
Browse files

Merge "Remove sdk extensions from module_lib / system_server api databases"...

Merge "Remove sdk extensions from module_lib / system_server api databases" am: f7c8ab4a am: 445fe0aa am: 09aa429d

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



Change-Id: Idcd0b6f2efe783a6989f316d229497e09ec4a03f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ff4e5ca9 09aa429d
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -546,7 +546,8 @@ droidstubs {
        "api-versions-jars-dir",
    ],
    api_levels_sdk_type: "module-lib",
    extensions_info_file: ":sdk-extensions-info",
    // extensions_info_file is purposefully omitted, because this module should just be
    // the non-updatable portions of the sdk, and extension sdks are updatable.
}

droidstubs {
@@ -563,7 +564,8 @@ droidstubs {
        "api-versions-jars-dir",
    ],
    api_levels_sdk_type: "system-server",
    extensions_info_file: ":sdk-extensions-info",
    // extensions_info_file is purposefully omitted, because this module should just be
    // the non-updatable portions of the sdk, and extension sdks are updatable.
}

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