Merge changes I549d78ba,I2a3bbe64,Id48dabf8
* changes:
gn2bp: Add linker script to modules
gn2bp: Add missing linker flags
gn2bp: Fix C++ warning showing up as errors when compiling cronet tests
diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index d7e751d..b463052 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.
+build = ["Android.extras.bp"]
+
// GN: PACKAGE
package {
default_applicable_licenses: [
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 8e3888c..9172fb4 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -45,6 +45,8 @@
'//components/cronet/android:cronet_android_mainline',
]
+EXTRAS_ANDROID_BP_FILE = "Android.extras.bp"
+
# Defines a custom init_rc argument to be applied to the corresponding output
# blueprint target.
target_initrc = {
@@ -1843,6 +1845,8 @@
// limitations under the License.
//
// This file is automatically generated by %s. Do not edit.
+
+build = ["Android.extras.bp"]
""" % (tool_name)
]
blueprint.to_string(output)