LineageOS/android_packages_modules_common
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mainline_modules_sdks.py: Fix issues with r snapshot am: fa90e1e5e0

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2047364

Change-Id: Ibc188124362c2a2bbb026512cf234c7a7231e3e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Paul Duffin
2022-03-30 17:46:55 +00:00
committed by Automerger Merge Worker
parent 7a561d6ed1 fa90e1e5e0
commit 11c3bd80e0
4 changed files with 36 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
build/mainline_modules_sdks.py
View File

@@ -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",
}},
}}

4
build/mainline_modules_sdks_test.py
View File

@@ -160,8 +160,8 @@ class TestProduceDist(unittest.TestCase):
r_snaphot_dir = os.path.join(self.tmp_out_dir,
"soong/mainline-sdks/test/for-R-build")
aosp_ipsec_r_bp_file = "com.android.ipsec/Android.bp"
google_wifi_android_bp = "com.google.android.wifi/Android.bp"
aosp_ipsec_r_bp_file = "com.android.ipsec/sdk_library/Android.bp"
google_wifi_android_bp = "com.google.android.wifi/sdk_library/Android.bp"
self.assertEqual([
aosp_ipsec_r_bp_file,
"com.android.ipsec/sdk_library/public/android.net.ipsec.ike-removed.txt",

21
build/mainline_modules_sdks_test_data/google_wifi_for_r_Android.bp
View File

@@ -26,24 +26,21 @@ java_sdk_library_import {
"test_com.android.wifi",
],
public: {
jars: ["sdk_library/public/framework-wifi-stubs.jar"],
stub_srcs: ["sdk_library/public/framework-wifi.srcjar"],
current_api: "sdk_library/public/framework-wifi.txt",
removed_api: "sdk_library/public/framework-wifi-removed.txt",
jars: ["public/framework-wifi-stubs.jar"],
current_api: "public/framework-wifi.txt",
removed_api: "public/framework-wifi-removed.txt",
sdk_version: "module_current",
},
system: {
jars: ["sdk_library/system/framework-wifi-stubs.jar"],
stub_srcs: ["sdk_library/system/framework-wifi.srcjar"],
current_api: "sdk_library/system/framework-wifi.txt",
removed_api: "sdk_library/system/framework-wifi-removed.txt",
jars: ["system/framework-wifi-stubs.jar"],
current_api: "system/framework-wifi.txt",
removed_api: "system/framework-wifi-removed.txt",
sdk_version: "module_current",
},
module_lib: {
jars: ["sdk_library/module-lib/framework-wifi-stubs.jar"],
stub_srcs: ["sdk_library/module-lib/framework-wifi.srcjar"],
current_api: "sdk_library/module-lib/framework-wifi.txt",
removed_api: "sdk_library/module-lib/framework-wifi-removed.txt",
jars: ["module-lib/framework-wifi-stubs.jar"],
current_api: "module-lib/framework-wifi.txt",
removed_api: "module-lib/framework-wifi-removed.txt",
sdk_version: "module_current",
},
}

21
build/mainline_modules_sdks_test_data/ipsec_for_r_Android.bp
View File

@@ -26,24 +26,21 @@ java_sdk_library_import {
"test_com.android.ipsec",
],
public: {
jars: ["sdk_library/public/android.net.ipsec.ike-stubs.jar"],
stub_srcs: ["sdk_library/public/android.net.ipsec.ike.srcjar"],
current_api: "sdk_library/public/android.net.ipsec.ike.txt",
removed_api: "sdk_library/public/android.net.ipsec.ike-removed.txt",
jars: ["public/android.net.ipsec.ike-stubs.jar"],
current_api: "public/android.net.ipsec.ike.txt",
removed_api: "public/android.net.ipsec.ike-removed.txt",
sdk_version: "module_current",
},
system: {
jars: ["sdk_library/system/android.net.ipsec.ike-stubs.jar"],
stub_srcs: ["sdk_library/system/android.net.ipsec.ike.srcjar"],
current_api: "sdk_library/system/android.net.ipsec.ike.txt",
removed_api: "sdk_library/system/android.net.ipsec.ike-removed.txt",
jars: ["system/android.net.ipsec.ike-stubs.jar"],
current_api: "system/android.net.ipsec.ike.txt",
removed_api: "system/android.net.ipsec.ike-removed.txt",
sdk_version: "module_current",
},
module_lib: {
jars: ["sdk_library/module-lib/android.net.ipsec.ike-stubs.jar"],
stub_srcs: ["sdk_library/module-lib/android.net.ipsec.ike.srcjar"],
current_api: "sdk_library/module-lib/android.net.ipsec.ike.txt",
removed_api: "sdk_library/module-lib/android.net.ipsec.ike-removed.txt",
jars: ["module-lib/android.net.ipsec.ike-stubs.jar"],
current_api: "module-lib/android.net.ipsec.ike.txt",
removed_api: "module-lib/android.net.ipsec.ike-removed.txt",
sdk_version: "module_current",
},
}