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
This commit is contained in:
Mohannad Farrag
2023-03-23 12:36:46 +00:00
committed by Gerrit Code Review
parent 16ba062336
commit 8484ec4dcd
6 changed files with 13 additions and 9 deletions

View File

@@ -38,6 +38,6 @@ android_test {
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"
],
}

View File

@@ -36,7 +36,7 @@ java_genrule {
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 @@ android_test {
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",

View File

@@ -67,7 +67,7 @@ apex_defaults {
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 @@ apex_defaults {
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",
],

View File

@@ -75,12 +75,12 @@ java_defaults {
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 {
java_defaults {
name: "CronetJavaPrejarjarDefaultsEnabled",
static_libs: [
"cronet_aml_api_java",
"cronet_aml_java"
"//external/cronet:cronet_aml_api_java",
"//external/cronet:cronet_aml_java"
],
}

View File

@@ -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

View File

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