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

Revert^2 "gn2bp: Remove soong_namespace"

Browse Source 
8484ec4dcd

Change-Id: I490c09179ea6a20ca5fba83c314b552d360be688
This commit is contained in:
Mohannad Farrag
2023-03-23 12:45:45 +00:00
parent 8484ec4dcd
commit 9c6801f81b
6 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cronet/tests/common/Android.bp
View File

@@ -38,6 +38,6 @@ android_test {
jarjar_rules: ":net-http-test-jarjar-rules", jarjar_rules: ":net-http-test-jarjar-rules",
compile_multilib: "both", // Include both the 32 and 64 bit versions compile_multilib: "both", // Include both the 32 and 64 bit versions
jni_libs: [ jni_libs: [
"//external/cronet:cronet_aml_components_cronet_android_cronet_tests__testing" "cronet_aml_components_cronet_android_cronet_tests__testing"
], ],
} }

6
Cronet/tests/mts/Android.bp
View File

@@ -36,11 +36,11 @@ java_genrule {
android_library { android_library {
name: "NetHttpTestsLibPreJarJar", name: "NetHttpTestsLibPreJarJar",
srcs: ["//external/cronet:cronet_aml_javatests_sources"], srcs: [":cronet_aml_javatests_sources"],
sdk_version: "module_current", sdk_version: "module_current",
min_sdk_version: "30", min_sdk_version: "30",
static_libs: [ static_libs: [
"//external/cronet:cronet_testserver_utils", "cronet_testserver_utils",
"androidx.test.ext.junit", "androidx.test.ext.junit",
"androidx.test.rules", "androidx.test.rules",
"junit", "junit",
@@ -61,7 +61,7 @@ android_test {
static_libs: ["NetHttpTestsLibPreJarJar"], static_libs: ["NetHttpTestsLibPreJarJar"],
jarjar_rules: ":net-http-test-jarjar-rules", jarjar_rules: ":net-http-test-jarjar-rules",
jni_libs: [ jni_libs: [
"//external/cronet:cronet_aml_components_cronet_android_cronet_tests__testing" "cronet_aml_components_cronet_android_cronet_tests__testing"
], ],
test_suites: [ test_suites: [
"general-tests", "general-tests",

4
Tethering/apex/Android.bp
View File

@@ -67,7 +67,7 @@ apex_defaults {
apex_defaults { apex_defaults {
name: "CronetInTetheringApexDefaultsEnabled", name: "CronetInTetheringApexDefaultsEnabled",
jni_libs: [ jni_libs: [
"//external/cronet:cronet_aml_components_cronet_android_cronet", "cronet_aml_components_cronet_android_cronet",
"//external/cronet/third_party/boringssl:libcrypto", "//external/cronet/third_party/boringssl:libcrypto",
"//external/cronet/third_party/boringssl:libssl", "//external/cronet/third_party/boringssl:libssl",
], ],
@@ -75,7 +75,7 @@ apex_defaults {
riscv64: { riscv64: {
// TODO: remove this when there is a riscv64 libcronet // TODO: remove this when there is a riscv64 libcronet
exclude_jni_libs: [ exclude_jni_libs: [
"//external/cronet:cronet_aml_components_cronet_android_cronet", "cronet_aml_components_cronet_android_cronet",
"//external/cronet/third_party/boringssl:libcrypto", "//external/cronet/third_party/boringssl:libcrypto",
"//external/cronet/third_party/boringssl:libssl", "//external/cronet/third_party/boringssl:libssl",
], ],

8
Tethering/common/TetheringLib/Android.bp
View File

@@ -75,12 +75,12 @@ java_defaults {
java_defaults { java_defaults {
name: "CronetJavaDefaultsEnabled", name: "CronetJavaDefaultsEnabled",
srcs: ["//external/cronet:cronet_aml_api_sources"], srcs: [":cronet_aml_api_sources"],
libs: [ libs: [
"androidx.annotation_annotation", "androidx.annotation_annotation",
], ],
impl_only_static_libs: [ impl_only_static_libs: [
"//external/cronet:cronet_aml_java", "cronet_aml_java",
], ],
api_dir: "cronet_enabled/api", api_dir: "cronet_enabled/api",
} }
@@ -101,8 +101,8 @@ java_defaults {
java_defaults { java_defaults {
name: "CronetJavaPrejarjarDefaultsEnabled", name: "CronetJavaPrejarjarDefaultsEnabled",
static_libs: [ static_libs: [
"//external/cronet:cronet_aml_api_java", "cronet_aml_api_java",
"//external/cronet:cronet_aml_java" "cronet_aml_java"
], ],
} }

2
tools/gn2bp/Android.bp.swp
View File

@@ -14,8 +14,6 @@
// //
// This file is automatically generated by gen_android_bp. Do not edit. // This file is automatically generated by gen_android_bp. Do not edit.
soong_namespace {}
build = ["Android.extras.bp"] build = ["Android.extras.bp"]
// The actual license can be found in Android.extras.bp // The actual license can be found in Android.extras.bp

2
tools/gn2bp/gen_android_bp
View File

@@ -1921,8 +1921,6 @@ def main():
// //
// This file is automatically generated by %s. Do not edit. // This file is automatically generated by %s. Do not edit.
soong_namespace {}
build = ["Android.extras.bp"] build = ["Android.extras.bp"]
""" % (tool_name) """ % (tool_name)
] ]