gn2bp: Add boringssl change to gn2bp generator
Test: None
Change-Id: I5c32d3ec6e0e7351650896b96dd9f2755fe9ca1b
diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index c6e508c..f0d8156 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -10300,6 +10300,7 @@
cc_defaults {
name: "cronet_aml_defaults",
cflags: [
+ "-DBORINGSSL_SHARED_LIBRARY",
"-DGOOGLE_PROTOBUF_NO_RTTI",
"-Wno-ambiguous-reversed-operator",
"-Wno-c++11-narrowing",
@@ -10320,6 +10321,7 @@
"com.android.tethering",
],
min_sdk_version: "29",
+ c_std: "gnu11",
target: {
android: {
shared_libs: [
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 23edbff..d6f4c83 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -475,8 +475,7 @@
self.processor_class = None
self.sdk_version = None
self.javacflags = set()
- self.license_kinds = set()
- self.license_text = set()
+ self.c_std = None
self.default_applicable_licenses = set()
def to_string(self, output):
@@ -534,8 +533,7 @@
self._output_field(output, 'processor_class')
self._output_field(output, 'sdk_version')
self._output_field(output, 'javacflags')
- self._output_field(output, 'license_kinds')
- self._output_field(output, 'license_text')
+ self._output_field(output, 'c_std')
self._output_field(output, 'default_applicable_licenses')
if self.rtti:
self._output_field(output, 'rtti')
@@ -1757,6 +1755,7 @@
defaults = Module('cc_defaults', defaults_module, '//gn:default_deps')
defaults.cflags = [
'-DGOOGLE_PROTOBUF_NO_RTTI',
+ '-DBORINGSSL_SHARED_LIBRARY',
'-Wno-error=return-type',
'-Wno-non-virtual-dtor',
'-Wno-macro-redefined',
@@ -1770,6 +1769,7 @@
'-fPIC',
'-Wno-c++11-narrowing',
]
+ defaults.c_std = 'gnu11'
# Chromium builds do not add a dependency for headers found inside the
# sysroot, so they are added globally via defaults.
defaults.target['android'].header_libs = [