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

Browse Source 
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
This commit is contained in:
Paul Duffin
2022-03-29 12:49:29 +00:00
parent 2ef33a4d65
commit fa90e1e5e0
4 changed files with 36 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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