Revert^2 "gn2bp: Remove `soong_namespace`"
8484ec4dcde0b37c853adddd5b8c91e6b5940e93
Change-Id: I490c09179ea6a20ca5fba83c314b552d360be688
diff --git a/Cronet/tests/common/Android.bp b/Cronet/tests/common/Android.bp
index 86fd807..5d2f6e5 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: [
- "//external/cronet:cronet_aml_components_cronet_android_cronet_tests__testing"
+ "cronet_aml_components_cronet_android_cronet_tests__testing"
],
}
diff --git a/Cronet/tests/mts/Android.bp b/Cronet/tests/mts/Android.bp
index 2b5f578..0c0d611 100644
--- a/Cronet/tests/mts/Android.bp
+++ b/Cronet/tests/mts/Android.bp
@@ -36,11 +36,11 @@
android_library {
name: "NetHttpTestsLibPreJarJar",
- srcs: ["//external/cronet:cronet_aml_javatests_sources"],
+ srcs: [":cronet_aml_javatests_sources"],
sdk_version: "module_current",
min_sdk_version: "30",
static_libs: [
- "//external/cronet:cronet_testserver_utils",
+ "cronet_testserver_utils",
"androidx.test.ext.junit",
"androidx.test.rules",
"junit",
@@ -61,7 +61,7 @@
static_libs: ["NetHttpTestsLibPreJarJar"],
jarjar_rules: ":net-http-test-jarjar-rules",
jni_libs: [
- "//external/cronet:cronet_aml_components_cronet_android_cronet_tests__testing"
+ "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 ff5acf5..15b3938 100644
--- a/Tethering/apex/Android.bp
+++ b/Tethering/apex/Android.bp
@@ -67,7 +67,7 @@
apex_defaults {
name: "CronetInTetheringApexDefaultsEnabled",
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:libssl",
],
@@ -75,7 +75,7 @@
riscv64: {
// TODO: remove this when there is a riscv64 libcronet
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:libssl",
],
diff --git a/Tethering/common/TetheringLib/Android.bp b/Tethering/common/TetheringLib/Android.bp
index a3756e0..4f95bdd 100644
--- a/Tethering/common/TetheringLib/Android.bp
+++ b/Tethering/common/TetheringLib/Android.bp
@@ -75,12 +75,12 @@
java_defaults {
name: "CronetJavaDefaultsEnabled",
- srcs: ["//external/cronet:cronet_aml_api_sources"],
+ srcs: [":cronet_aml_api_sources"],
libs: [
"androidx.annotation_annotation",
],
impl_only_static_libs: [
- "//external/cronet:cronet_aml_java",
+ "cronet_aml_java",
],
api_dir: "cronet_enabled/api",
}
@@ -101,8 +101,8 @@
java_defaults {
name: "CronetJavaPrejarjarDefaultsEnabled",
static_libs: [
- "//external/cronet:cronet_aml_api_java",
- "//external/cronet:cronet_aml_java"
+ "cronet_aml_api_java",
+ "cronet_aml_java"
],
}
diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index 8e6703a..e1ed23e 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -14,8 +14,6 @@
//
// 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 e25abf0..7ab8616 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -1921,8 +1921,6 @@
//
// This file is automatically generated by %s. Do not edit.
-soong_namespace {}
-
build = ["Android.extras.bp"]
""" % (tool_name)
]