Commit Graph

71599 Commits

Author SHA1 Message Date
Motomu Utsumi
7d92999a06 gn2bp: add desc_arm64.json am: fff513db18
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2308852

Change-Id: I0faee4405b6fc90ea78b67abcdfeffbeab212aa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-18 11:37:23 +00:00
Motomu Utsumi
5557c8ca31 gn2bp: add desc_x86.json am: ad4314183b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2308851

Change-Id: I539f5899cff72f7fd6228e9f810d5e1ceed016c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-18 11:37:21 +00:00
Motomu Utsumi
067d06ee4f gn2bp: rename desc.json to desc_x64.json am: ba876a6b3c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2308850

Change-Id: I6db00b9e66c4aa356b3819421b195865aa455285
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-18 11:37:19 +00:00
Motomu Utsumi
9fda099920 gn2bp: Remove test targets am: 1b16989360
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2308849

Change-Id: I4efa3546aaaa536edc66b29450c33b84477ba4cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-18 11:37:17 +00:00
Motomu Utsumi
5539463ed1 gn2bp: Skip extracting common part for source_set
Test: ./update_results.sh
Change-Id: I429cef85ffbb47df0e44970732f223d81e2867c8
2022-11-18 20:00:04 +09:00
Motomu Utsumi
6550118309 gn2bp: Add desc_x86.json to update_results.sh
Generate Android.bp.swp from desc_x64.json and desc_x86.json

Test: ./update_results.sh
Change-Id: I9ad74af6b7a792c736ec68523d398d67729cc81f
2022-11-18 19:39:25 +09:00
Motomu Utsumi
879dec819d gn2bp: Support multiple desc files
Test: ./update_results.sh
Change-Id: Ice6dc1a2e01dbecdc92fcd5e118df56da138a8d4
2022-11-18 19:39:25 +09:00
Motomu Utsumi
a71281cd12 gn2bp: Remove desc from the arg of create_blueprint_for_targets
Test: ./update_results.sh
Change-Id: I31e438f820b8d198851da1124cc544bc108f3446
2022-11-18 19:39:25 +09:00
Motomu Utsumi
7a122f52b3 gn2bp: add desc_arm.json
This is a preparation to support multiple desc.json for differet
target_cpu.

desc_arm is generated with following configuration.

args.gn
```
target_os = "android"
enable_websockets = false
disable_file_support = true
disable_brotli_filter = false
is_component_build = false
use_crash_key_stubs = true
use_partition_alloc = false
include_transport_security_state_preload_list = false
use_platform_icu_alternatives = true
default_min_sdk_version = 19
use_errorprone_java_compiler = true
enable_reporting = true
use_hashed_jni_names = true
treat_warnings_as_errors = false

enable_base_tracing = false
target_cpu = "arm"
```
chromium at 14f5ebc46c254d2e4956f10c87e7ae7d8bc72969 with following
changes.
```
diff --git a/components/cronet/android/BUILD.gn b/components/cronet/android/BUILD.gn
index 16e3bbfd3f3..89d2f3d8a1e 100644
-- a/components/cronet/android/BUILD.gn
++ b/components/cronet/android/BUILD.gn
@@ -1600,22 +1600,8 @@ if (!is_component_build) {
     if (use_platform_icu_alternatives &&
         (!(target_cpu == "arm" && arm_version == 7) || !arm_use_neon)) {
       deps = [
-        ":api_static_checks",
-        ":cronet_package_copy",
-        ":cronet_package_copy_native_headers",
         ":cronet_package_copy_native_lib",
-        ":cronet_package_copy_native_lib_unstripped",
-        ":cronet_package_copy_resources",
-        ":cronet_sizes",
-        ":cronet_test_package",
-        ":generate_javadoc",
-        ":generate_licenses",
         ":jar_cronet_api_source",
-        ":jar_cronet_impl_common_java_source",
-        ":jar_cronet_impl_fake_java_source",
-        ":jar_cronet_impl_native_java_source",
-        ":jar_cronet_impl_platform_java_source",
-        ":jar_cronet_sample_source",
         ":repackage_api",
         ":repackage_common",
         ":repackage_fake",
diff --git a/net/BUILD.gn b/net/BUILD.gn
index de630fff3c1..e380bd0dd3d 100644
-- a/net/BUILD.gn
++ b/net/BUILD.gn
@@ -1632,7 +1632,6 @@ source_set("net_deps") {
     ":constants",
     ":isolation_info_proto",
     ":net_export_header",
-    ":net_resources",
     ":preload_decoder",
     "//base",
     "//base/third_party/dynamic_annotations",
```

Test: ./gen_android_bp --desc desc_arm.json "//components/cronet/android:cronet"
Change-Id: Ifebde41e8ab39621b74cbf04ad8efee68d5bee39
2022-11-18 19:39:24 +09:00
Motomu Utsumi
fff513db18 gn2bp: add desc_arm64.json
This is a preparation to support multiple desc.json for differet
target_cpu.

desc_arm64 is generated with following configuration.

args.gn
```
target_os = "android"
enable_websockets = false
disable_file_support = true
disable_brotli_filter = false
is_component_build = false
use_crash_key_stubs = true
use_partition_alloc = false
include_transport_security_state_preload_list = false
use_platform_icu_alternatives = true
default_min_sdk_version = 19
use_errorprone_java_compiler = true
enable_reporting = true
use_hashed_jni_names = true
treat_warnings_as_errors = false

enable_base_tracing = false
target_cpu = "arm64"
```
chromium at 14f5ebc46c254d2e4956f10c87e7ae7d8bc72969 with following
changes.
```
diff --git a/components/cronet/android/BUILD.gn b/components/cronet/android/BUILD.gn
index 16e3bbfd3f3..89d2f3d8a1e 100644
-- a/components/cronet/android/BUILD.gn
++ b/components/cronet/android/BUILD.gn
@@ -1600,22 +1600,8 @@ if (!is_component_build) {
     if (use_platform_icu_alternatives &&
         (!(target_cpu == "arm" && arm_version == 7) || !arm_use_neon)) {
       deps = [
-        ":api_static_checks",
-        ":cronet_package_copy",
-        ":cronet_package_copy_native_headers",
         ":cronet_package_copy_native_lib",
-        ":cronet_package_copy_native_lib_unstripped",
-        ":cronet_package_copy_resources",
-        ":cronet_sizes",
-        ":cronet_test_package",
-        ":generate_javadoc",
-        ":generate_licenses",
         ":jar_cronet_api_source",
-        ":jar_cronet_impl_common_java_source",
-        ":jar_cronet_impl_fake_java_source",
-        ":jar_cronet_impl_native_java_source",
-        ":jar_cronet_impl_platform_java_source",
-        ":jar_cronet_sample_source",
         ":repackage_api",
         ":repackage_common",
         ":repackage_fake",
diff --git a/net/BUILD.gn b/net/BUILD.gn
index de630fff3c1..e380bd0dd3d 100644
-- a/net/BUILD.gn
++ b/net/BUILD.gn
@@ -1632,7 +1632,6 @@ source_set("net_deps") {
     ":constants",
     ":isolation_info_proto",
     ":net_export_header",
-    ":net_resources",
     ":preload_decoder",
     "//base",
     "//base/third_party/dynamic_annotations",
```

Test: ./gen_android_bp --desc desc_arm64.json "//components/cronet/android:cronet"
Change-Id: I79943c9d2fdef8c2c23ad32a2a43c08afd9a7458
2022-11-18 19:39:23 +09:00
Motomu Utsumi
ad4314183b gn2bp: add desc_x86.json
This is a preparation to support multiple desc.json for differet
target_cpu.

desc_x86 is generated with following configuration.

args.gn
```
target_os = "android"
enable_websockets = false
disable_file_support = true
disable_brotli_filter = false
is_component_build = false
use_crash_key_stubs = true
use_partition_alloc = false
include_transport_security_state_preload_list = false
use_platform_icu_alternatives = true
default_min_sdk_version = 19
use_errorprone_java_compiler = true
enable_reporting = true
use_hashed_jni_names = true
treat_warnings_as_errors = false

enable_base_tracing = false
target_cpu = "x86"
```
chromium at 14f5ebc46c254d2e4956f10c87e7ae7d8bc72969 with following
changes.
```
diff --git a/components/cronet/android/BUILD.gn b/components/cronet/android/BUILD.gn
index 16e3bbfd3f3..89d2f3d8a1e 100644
-- a/components/cronet/android/BUILD.gn
++ b/components/cronet/android/BUILD.gn
@@ -1600,22 +1600,8 @@ if (!is_component_build) {
     if (use_platform_icu_alternatives &&
         (!(target_cpu == "arm" && arm_version == 7) || !arm_use_neon)) {
       deps = [
-        ":api_static_checks",
-        ":cronet_package_copy",
-        ":cronet_package_copy_native_headers",
         ":cronet_package_copy_native_lib",
-        ":cronet_package_copy_native_lib_unstripped",
-        ":cronet_package_copy_resources",
-        ":cronet_sizes",
-        ":cronet_test_package",
-        ":generate_javadoc",
-        ":generate_licenses",
         ":jar_cronet_api_source",
-        ":jar_cronet_impl_common_java_source",
-        ":jar_cronet_impl_fake_java_source",
-        ":jar_cronet_impl_native_java_source",
-        ":jar_cronet_impl_platform_java_source",
-        ":jar_cronet_sample_source",
         ":repackage_api",
         ":repackage_common",
         ":repackage_fake",
diff --git a/net/BUILD.gn b/net/BUILD.gn
index de630fff3c1..e380bd0dd3d 100644
-- a/net/BUILD.gn
++ b/net/BUILD.gn
@@ -1632,7 +1632,6 @@ source_set("net_deps") {
     ":constants",
     ":isolation_info_proto",
     ":net_export_header",
-    ":net_resources",
     ":preload_decoder",
     "//base",
     "//base/third_party/dynamic_annotations",
```

Test: ./gen_android_bp --desc desc_x86.json "//components/cronet/android:cronet"
Change-Id: Id221efc612e2fb8ebadfec4a87902046b91f1e85
2022-11-18 19:39:23 +09:00
Motomu Utsumi
ba876a6b3c gn2bp: rename desc.json to desc_x64.json
This is a preparation to support multiple desc.json for differet
target_cpu.

desc_x64 is generated with following configuration.

args.gn
```
target_os = "android"
enable_websockets = false
disable_file_support = true
disable_brotli_filter = false
is_component_build = false
use_crash_key_stubs = true
use_partition_alloc = false
include_transport_security_state_preload_list = false
use_platform_icu_alternatives = true
default_min_sdk_version = 19
use_errorprone_java_compiler = true
enable_reporting = true
use_hashed_jni_names = true
treat_warnings_as_errors = false

enable_base_tracing = false
target_cpu = "x64"
```
chromium at 14f5ebc46c254d2e4956f10c87e7ae7d8bc72969 with following
changes.
```
diff --git a/components/cronet/android/BUILD.gn b/components/cronet/android/BUILD.gn
index 16e3bbfd3f3..89d2f3d8a1e 100644
-- a/components/cronet/android/BUILD.gn
++ b/components/cronet/android/BUILD.gn
@@ -1600,22 +1600,8 @@ if (!is_component_build) {
     if (use_platform_icu_alternatives &&
         (!(target_cpu == "arm" && arm_version == 7) || !arm_use_neon)) {
       deps = [
-        ":api_static_checks",
-        ":cronet_package_copy",
-        ":cronet_package_copy_native_headers",
         ":cronet_package_copy_native_lib",
-        ":cronet_package_copy_native_lib_unstripped",
-        ":cronet_package_copy_resources",
-        ":cronet_sizes",
-        ":cronet_test_package",
-        ":generate_javadoc",
-        ":generate_licenses",
         ":jar_cronet_api_source",
-        ":jar_cronet_impl_common_java_source",
-        ":jar_cronet_impl_fake_java_source",
-        ":jar_cronet_impl_native_java_source",
-        ":jar_cronet_impl_platform_java_source",
-        ":jar_cronet_sample_source",
         ":repackage_api",
         ":repackage_common",
         ":repackage_fake",
diff --git a/net/BUILD.gn b/net/BUILD.gn
index de630fff3c1..e380bd0dd3d 100644
-- a/net/BUILD.gn
++ b/net/BUILD.gn
@@ -1632,7 +1632,6 @@ source_set("net_deps") {
     ":constants",
     ":isolation_info_proto",
     ":net_export_header",
-    ":net_resources",
     ":preload_decoder",
     "//base",
     "//base/third_party/dynamic_annotations",
```

Test: ./update_results.sh
Change-Id: Iae45100c654e955c5c805536b8126b0603d3d255
2022-11-18 19:39:22 +09:00
Motomu Utsumi
1b16989360 gn2bp: Remove test targets
"//base:base_test" was for local testing and should not be in the
desc.json.

Test: ./update_results.sh
Change-Id: I3124505e1fc1dff4530966fbe5f49e85cdd1b04b
2022-11-18 19:39:16 +09:00
Motomu Utsumi
523148ffe3 Merge "gn2bp: move sysroot include to cc_default" am: be62aee3df
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2308459

Change-Id: Ibcfd404e7ca1f7ef4d16367d91bbaafb475e8511
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-18 09:53:12 +00:00
Motomu Utsumi
be62aee3df Merge "gn2bp: move sysroot include to cc_default" 2022-11-18 09:33:26 +00:00
Chalard Jean
c4cff7e40c Reinstate sleep pending better fix
Bug: 259506077
Test: ConnectivityDiagnosticsManagerTest
Change-Id: I2fa304e978267dc4fd23012d128150f6bbf32133
2022-11-18 17:18:01 +09:00
Chiachang Wang
0d90d09aad Merge "Move VpnTransportInfoTest to common test" am: dfea18945c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2300544

Change-Id: I66bbdad7c05b3e318459ac31c7f5601dbd872a14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-18 06:21:32 +00:00
Chiachang Wang
dfea18945c Merge "Move VpnTransportInfoTest to common test" 2022-11-18 05:44:20 +00:00
Patrick Rohr
81435163b0 gn2bp: move sysroot include to cc_default
Order in local_include_dirs matter and -isystem is not supported.
export_system_include_dirs is properly ignored in cc_binary.

Test: none
Change-Id: I22c981727d2a9b11f5b041ef6c6a7b95a05cc030
2022-11-17 19:34:32 -08:00
chiachangwang
91bac1953c Move VpnTransportInfoTest to common test
Move VpnTransportInfoTest to common test to add the cts
coverage.

Annotate @ConnectivityModuleTest so that the test will
not fail with module that is not up-to-date, and use
assertParcelingIsLossless to prevent similar order module
in device case.

Bug: 256775913
Test: atest CtsNetTestCases:android.net.VpnTransportInfoTest
Change-Id: I1c40a4fc42468748d71c3df5c18b2ceb5b3769e1
2022-11-18 02:17:33 +00:00
Patrick Rohr
0e9f3134f6 gn2bp: handle target-specific dependencies am: b51878f6c3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2307146

Change-Id: I2086413e21fee7e6c84ae93055346edbe367ebf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17 15:29:36 +00:00
Patrick Rohr
9e592ab6b1 gn2bp: collect linker unit deps per target am: 297f979e8f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2307145

Change-Id: I040003e3c0d2715a55ee775fce04688d155257c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17 15:29:33 +00:00
Patrick Rohr
4eb7495728 gn2bp: remove is_third_party_dep am: f1004372e6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2307144

Change-Id: Iaf69aa76468c9976b26b33917af31cd390a77027
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17 15:29:31 +00:00
Patrick Rohr
b51878f6c3 gn2bp: handle target-specific dependencies
This currently only supports cc_library_static as its the only target
that is currently used in this way.

Test: //components/cronet/android:cronet
Change-Id: Ia3f0338f486890835691c1435ee1a297d9e62f81
2022-11-17 07:06:20 -08:00
Patrick Rohr
297f979e8f gn2bp: collect linker unit deps per target
Both transitive static libraries and LINKER_UNIT_TYPES dependencies need
to be stored separately for every target as they could differ. In
reality, only static deps differ right now.

I am not a big fan of how transitive_static_libs_deps are handled in
this CL; maybe we can come up with a more readable solution.

Test: //components/cronet/android:cronet
Change-Id: Ia4ad8e264b1243b7dd5d58a26543ee78206f9c79
2022-11-17 07:05:47 -08:00
Patrick Rohr
f1004372e6 gn2bp: remove is_third_party_dep
This is not used anymore.

Test: //components/cronet/android:cronet
Change-Id: Ie6d21f93e44348b51732b6030de315e8c67db52a
2022-11-17 07:03:09 -08:00
Mohannad Farrag
5cdb9534ae Merge changes Iac05e49a,If9b0e74b,I341043b4,I5eef9120,I4d747786, ... am: 5f55226309
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2306314

Change-Id: Ib4d7119f14891afc1f42946f16d798acd8a71793
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17 14:32:58 +00:00
Mohannad Farrag
5f55226309 Merge changes Iac05e49a,If9b0e74b,I341043b4,I5eef9120,I4d747786, ...
* changes:
  gn2bp: Add flags and include_dirs to target
  gn2bp: Add cppflags and local_include_dirs to Target
  gn2bp: Split function to set local_include_dirs
  gn2bp: Split function to set module flags
  gn2bp: Add indlue_dirs to arch
  gn2bp: Add defines to arch
  gn2bp: Add cflags to arch
2022-11-17 14:04:40 +00:00
Motomu Utsumi
f0f4768b5d gn2bp: Add flags and include_dirs to target
Test: ./update_results.sh
Change-Id: Iac05e49a7f195afec72e229f667a402bae8a1742
2022-11-17 22:45:34 +09:00
Motomu Utsumi
50ad217eb4 gn2bp: Add cppflags and local_include_dirs to Target
Test: ./update_results.sh
Change-Id: If9b0e74bb9957acfec2c6364a2083ec28db273b7
2022-11-17 22:45:33 +09:00
Motomu Utsumi
88efbb4a9c gn2bp: Split function to set local_include_dirs
Test: ./update_results.sh
Change-Id: I341043b46348cac2af949e121b4bb4cd8b266827
2022-11-17 22:45:33 +09:00
Motomu Utsumi
c34b137c01 gn2bp: Split function to set module flags
Test: ./update_results.sh
Change-Id: I5eef9120cf88f48ff8f3f59f6f8c77460af4df36
2022-11-17 22:45:33 +09:00
Motomu Utsumi
778f830dd1 gn2bp: Add indlue_dirs to arch
Test: ./update_results.sh
Change-Id: I4d7477869bbf0c121e2c0249d031a57b82e11e6f
2022-11-17 22:45:33 +09:00
Motomu Utsumi
80e044716b gn2bp: Add defines to arch
Test: ./update_results.sh
Change-Id: Ia167511becaa4c1ddb3ed40e2b78732fc291cb8e
2022-11-17 22:45:33 +09:00
Motomu Utsumi
1c64e448dc gn2bp: Add cflags to arch
Test: m cronet_aml_third_party_protobuf_protoc
Change-Id: Iea847d205fd258ae00ba1ff03e382798deb2f0a8
2022-11-17 22:45:25 +09:00
Mohannad Farrag
742d698fe2 Merge changes I7728eb4f,Ia31285bd,I7d08e055,I492d40ff am: 1c6f326073
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2306307

Change-Id: Ib3c0b513456c08eb8717ed6833432b2dfeeb785b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17 13:32:42 +00:00
Mohannad Farrag
1c6f326073 Merge changes I7728eb4f,Ia31285bd,I7d08e055,I492d40ff
* changes:
  gn2bp: Remove hardcoded arch support
  gn2bp: Remove .h files from srcs
  gn2bp: Update protoc tool name
  gn2bp: Make local_include_dir order deterministic
2022-11-17 12:57:56 +00:00
Motomu Utsumi
4b14ffca89 gn2bp: Remove hardcoded arch support
Currently, multi-toolchain is supported in generic way by target
condition
Test: ./update_results.sh

Change-Id: I7728eb4f7faada753d051af80fe179ffdf94fe10
2022-11-17 20:31:24 +09:00
Motomu Utsumi
40f95c53f5 gn2bp: Remove .h files from srcs
Test: ./update_results.sh
Change-Id: Ia31285bd046eae134bd221c72512214773952847
2022-11-17 20:31:24 +09:00
Motomu Utsumi
bd4013ff2f gn2bp: Update protoc tool name
Test: ./update_results.sh
Change-Id: I7d08e0557327768ec0a293028992fd6156e03583
2022-11-17 20:31:24 +09:00
Motomu Utsumi
20e8f899eb gn2bp: Make local_include_dir order deterministic
Test: ./update_results.sh 10 times
Change-Id: I492d40ffd867c62ef856ec882d0dc12c6eeeff91
2022-11-17 20:31:21 +09:00
Remi NGUYEN VAN
d4a8c9e175 Merge "Add MdnsNsecRecord" am: 0f92b69af7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2267174

Change-Id: I0d8b8270a6021067f1d080a48e4b73c5b0ad4401
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17 08:14:31 +00:00
Remi NGUYEN VAN
0f92b69af7 Merge "Add MdnsNsecRecord" 2022-11-17 08:00:15 +00:00
Motomu Utsumi
e836e0ecbc Merge changes Ie937102c,I47405379,Ic88a99ed,I37ad0250,I1583db83 am: dcc4e0a495
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2305344

Change-Id: I2aaae1d403b9600e3e4132f328c113a7bd556c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17 06:49:09 +00:00
Junyu Lai
51172df4f7 Merge "Test API behavior change in standalone test case" am: 0e7ecc0dd1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2301659

Change-Id: I2f4fd4f2ac986efbab97c4631c8543aabb59dc5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17 06:48:49 +00:00
Motomu Utsumi
dcc4e0a495 Merge changes Ie937102c,I47405379,Ic88a99ed,I37ad0250,I1583db83
* changes:
  gn2bp: change filegroup to cc_defaults
  gn2bp: change remove to discard
  gn2bp: move module_is_compiled to Module class
  gn2bp: using dep.name when adding dependency is more correct
  gn2bp: properly add proto_deps
2022-11-17 06:36:24 +00:00
Junyu Lai
0e7ecc0dd1 Merge "Test API behavior change in standalone test case" 2022-11-17 06:28:25 +00:00
Treehugger Robot
34b8699603 Merge "EthernetTetheringTest: remove isEthernetTetheringSupported" am: 5df4f1d862
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2306241

Change-Id: Icac116b6ab4e927e6269806899d77e359fcbbe00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17 06:20:24 +00:00
Patrick Rohr
82e96f31df gn2bp: change filegroup to cc_defaults
Filegroups do not support per-target/arch sources, but cc_defaults do.
Since modules that are not compiled (filegroups, genrules, cc_defaults)
do not support deps, only cc_library or cc_binary targets can depend on
filegroups. This means, it should be safe to convert filegroups to
cc_defaults.

Test: //components/cronet/android:cronet
Change-Id: Ie937102c093d46d42867e0472e43901fdf427894
2022-11-16 22:12:43 -08:00
Patrick Rohr
b2d816b8fb gn2bp: change remove to discard
This is probably not useful anymore, will work on removing some of this
soon.

Test: //components/cronet/android:cronet
Change-Id: I4740537972c9bf522abeb93a0306d981c8e71162
2022-11-16 22:12:15 -08:00