Revert "gn2bp: Remove `soong_namespace`"
Revert submission 2502135-remove_soong_namespace
Reason for revert: Missing line needs to be added
Reverted changes: /q/submissionid:2502135-remove_soong_namespace
Change-Id: I780a21cf7031e04eb368fda4f93ed16ea032ca8d
diff --git a/Cronet/tests/common/Android.bp b/Cronet/tests/common/Android.bp
index 5d2f6e5..86fd807 100644
--- a/Cronet/tests/common/Android.bp
+++ b/Cronet/tests/common/Android.bp
@@ -38,6 +38,6 @@
jarjar_rules: ":net-http-test-jarjar-rules",
compile_multilib: "both", // Include both the 32 and 64 bit versions
jni_libs: [
- "cronet_aml_components_cronet_android_cronet_tests__testing"
+ "//external/cronet:cronet_aml_components_cronet_android_cronet_tests__testing"
],
}
diff --git a/Cronet/tests/mts/Android.bp b/Cronet/tests/mts/Android.bp
index 2e8ac53..2b5f578 100644
--- a/Cronet/tests/mts/Android.bp
+++ b/Cronet/tests/mts/Android.bp
@@ -36,7 +36,7 @@
android_library {
name: "NetHttpTestsLibPreJarJar",
- srcs: [":cronet_aml_javatests_sources"],
+ srcs: ["//external/cronet:cronet_aml_javatests_sources"],
sdk_version: "module_current",
min_sdk_version: "30",
static_libs: [
@@ -61,7 +61,7 @@
static_libs: ["NetHttpTestsLibPreJarJar"],
jarjar_rules: ":net-http-test-jarjar-rules",
jni_libs: [
- "cronet_aml_components_cronet_android_cronet_tests__testing"
+ "//external/cronet:cronet_aml_components_cronet_android_cronet_tests__testing"
],
test_suites: [
"general-tests",
diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp
index 15b3938..ff5acf5 100644
--- a/Tethering/apex/Android.bp
+++ b/Tethering/apex/Android.bp
@@ -67,7 +67,7 @@
apex_defaults {
name: "CronetInTetheringApexDefaultsEnabled",
jni_libs: [
- "cronet_aml_components_cronet_android_cronet",
+ "//external/cronet:cronet_aml_components_cronet_android_cronet",
"//external/cronet/third_party/boringssl:libcrypto",
"//external/cronet/third_party/boringssl:libssl",
],
@@ -75,7 +75,7 @@
riscv64: {
// TODO: remove this when there is a riscv64 libcronet
exclude_jni_libs: [
- "cronet_aml_components_cronet_android_cronet",
+ "//external/cronet:cronet_aml_components_cronet_android_cronet",
"//external/cronet/third_party/boringssl:libcrypto",
"//external/cronet/third_party/boringssl:libssl",
],
diff --git a/Tethering/common/TetheringLib/Android.bp b/Tethering/common/TetheringLib/Android.bp
index 4f95bdd..a3756e0 100644
--- a/Tethering/common/TetheringLib/Android.bp
+++ b/Tethering/common/TetheringLib/Android.bp
@@ -75,12 +75,12 @@
java_defaults {
name: "CronetJavaDefaultsEnabled",
- srcs: [":cronet_aml_api_sources"],
+ srcs: ["//external/cronet:cronet_aml_api_sources"],
libs: [
"androidx.annotation_annotation",
],
impl_only_static_libs: [
- "cronet_aml_java",
+ "//external/cronet:cronet_aml_java",
],
api_dir: "cronet_enabled/api",
}
@@ -101,8 +101,8 @@
java_defaults {
name: "CronetJavaPrejarjarDefaultsEnabled",
static_libs: [
- "cronet_aml_api_java",
- "cronet_aml_java"
+ "//external/cronet:cronet_aml_api_java",
+ "//external/cronet:cronet_aml_java"
],
}
diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index e1ed23e..8e6703a 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -14,6 +14,8 @@
//
// This file is automatically generated by gen_android_bp. Do not edit.
+soong_namespace {}
+
build = ["Android.extras.bp"]
// The actual license can be found in Android.extras.bp
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 7ab8616..e25abf0 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -1921,6 +1921,8 @@
//
// This file is automatically generated by %s. Do not edit.
+soong_namespace {}
+
build = ["Android.extras.bp"]
""" % (tool_name)
]