From fa90e1e5e0d2c0e4ded12d66cc6ac59b7db4e264 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 29 Mar 2022 12:49:29 +0000 Subject: [PATCH] mainline_modules_sdks.py: Fix issues with r snapshot Moves the generated Android.bp file from the root of the snapshot zip file into the sdk_library/ sub-directory to allow the zip to be unpacked in a directory that already contains an Android.bp file that defines the apex_set for the corresponding APEX. Also, removes the stubs_src property from the generated Android.bp file. Bug: 218685706 Test: packages/modules/common/build/mainline_modules_sdks.sh --build-release=R atest --host mainline_modules_sdks_test # deleted vendor/unbundled_google/modules/IpSecGooglePrebuilt from rvc-dev checkout. # unpacked out/soong/mainline-sdks/for-R-build/ipsec-module-sdk-current.zip # ran "m nothing" Change-Id: I03e2060dc06338a8d0102744f79c75d33d567a17 --- build/mainline_modules_sdks.py | 29 ++++++++++--------- build/mainline_modules_sdks_test.py | 4 +-- .../google_wifi_for_r_Android.bp | 21 ++++++-------- .../ipsec_for_r_Android.bp | 21 ++++++-------- 4 files changed, 36 insertions(+), 39 deletions(-) diff --git a/build/mainline_modules_sdks.py b/build/mainline_modules_sdks.py index 6ebe37c..c0135ec 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", }}, }} diff --git a/build/mainline_modules_sdks_test.py b/build/mainline_modules_sdks_test.py index 84c775d..08ba652 100644 --- a/build/mainline_modules_sdks_test.py +++ b/build/mainline_modules_sdks_test.py @@ -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", diff --git a/build/mainline_modules_sdks_test_data/google_wifi_for_r_Android.bp b/build/mainline_modules_sdks_test_data/google_wifi_for_r_Android.bp index 3ad0705..11032b2 100644 --- a/build/mainline_modules_sdks_test_data/google_wifi_for_r_Android.bp +++ b/build/mainline_modules_sdks_test_data/google_wifi_for_r_Android.bp @@ -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", }, } diff --git a/build/mainline_modules_sdks_test_data/ipsec_for_r_Android.bp b/build/mainline_modules_sdks_test_data/ipsec_for_r_Android.bp index 0c3fdd2..8effc15 100644 --- a/build/mainline_modules_sdks_test_data/ipsec_for_r_Android.bp +++ b/build/mainline_modules_sdks_test_data/ipsec_for_r_Android.bp @@ -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", }, }