diff options
| author | Paul Duffin <paulduffin@google.com> | 2022-03-30 18:05:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-30 18:05:40 +0000 |
| commit | 19afde65a1c760955a2615e50a2970fbe8241082 (patch) | |
| tree | 433028e2732ca1209b936fc3b44d8bf464db580a /build/mainline_modules_sdks.py | |
| parent | c44a9cd835e606c30c9b0293c097d7a347387935 (diff) | |
| parent | 11c3bd80e0d86464b4afa36e05c4ecf7835492d7 (diff) | |
| download | common-19afde65a1c760955a2615e50a2970fbe8241082.tar.gz | |
mainline_modules_sdks.py: Fix issues with r snapshot am: fa90e1e5e0 am: 11c3bd80e0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2047364
Change-Id: I18b314bfdfde88c2fae89ceb9eb24af9e9418b71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'build/mainline_modules_sdks.py')
| -rwxr-xr-x | build/mainline_modules_sdks.py | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/build/mainline_modules_sdks.py b/build/mainline_modules_sdks.py index e906ab53..5c50c614 100755 --- a/build/mainline_modules_sdks.py +++ b/build/mainline_modules_sdks.py @@ -306,7 +306,13 @@ class SnapshotBuilder: apex = module.apex dest_dir = os.path.join(r_snapshot_dir, apex) os.makedirs(dest_dir, exist_ok=True) - bp_file = os.path.join(dest_dir, "Android.bp") + + # Write the bp file in the sdk_library sub-directory rather than the + # root of the zip file as it will be unpacked in a directory that + # already contains an Android.bp file that defines the corresponding + # apex_set. + bp_file = os.path.join(dest_dir, "sdk_library/Android.bp") + os.makedirs(os.path.dirname(bp_file), exist_ok=True) # The first sdk in the list is the name to use. sdk_name = module.sdks[0] @@ -338,24 +344,21 @@ java_sdk_library_import {{ "test_{aosp_apex}", ], public: {{ - jars: ["sdk_library/public/{module_name}-stubs.jar"], - stub_srcs: ["sdk_library/public/{module_name}.srcjar"], - current_api: "sdk_library/public/{module_name}.txt", - removed_api: "sdk_library/public/{module_name}-removed.txt", + jars: ["public/{module_name}-stubs.jar"], + current_api: "public/{module_name}.txt", + removed_api: "public/{module_name}-removed.txt", sdk_version: "module_current", }}, system: {{ - jars: ["sdk_library/system/{module_name}-stubs.jar"], - stub_srcs: ["sdk_library/system/{module_name}.srcjar"], - current_api: "sdk_library/system/{module_name}.txt", - removed_api: "sdk_library/system/{module_name}-removed.txt", + jars: ["system/{module_name}-stubs.jar"], + current_api: "system/{module_name}.txt", + removed_api: "system/{module_name}-removed.txt", sdk_version: "module_current", }}, module_lib: {{ - jars: ["sdk_library/module-lib/{module_name}-stubs.jar"], - stub_srcs: ["sdk_library/module-lib/{module_name}.srcjar"], - current_api: "sdk_library/module-lib/{module_name}.txt", - removed_api: "sdk_library/module-lib/{module_name}-removed.txt", + jars: ["module-lib/{module_name}-stubs.jar"], + current_api: "module-lib/{module_name}.txt", + removed_api: "module-lib/{module_name}-removed.txt", sdk_version: "module_current", }}, }} |