Commit graph android_packages_modules_Co.../tools
Message SHA1
gn2bp: Add apply patch function to gen_desc_json.sh
Test: ./gen_desc_json.sh
Change-Id: I971ad72a562a1340fa4a6f29468b7415915a7335

Motomu Utsumi   commited 2023-01-25 17:18:20 +09:00
eb19dca3ef
gn2bp Remove API helpers from cronet_aml_api_sources
Follow aosp/2388112
This CL does not add cronet_aml_api_helpers_sources module since it is
not used yet.
api helper sources will be added when they are used.

Test: ./update_results.sh, TH in aosp/2398772
Change-Id: I9f05aff302de9c24bc555f53e5e54d10f0d82057

Motomu Utsumi   commited 2023-01-23 20:49:16 +09:00
0fa312765f
gn2bp: Add framework-annotations-lib to cronet_aml_api_java
Follow aosp/2388112

Test: ./update_results.sh, TH in aosp/2398772
Change-Id: Ia9f3f221aab26b3cae59fecaf505dfb65c93ed95

Motomu Utsumi   commited 2023-01-23 20:49:16 +09:00
ffba28742d
gn2bp: Use ldflags to specify linker script
Follow workaround in aosp/2389777

Test: ./update_results.sh, TH in aosp/2398772
Change-Id: I43166004a20ca73c3375618232b349e724cfd211

Motomu Utsumi   commited 2023-01-23 20:49:13 +09:00
ab76aac035
Merge "gn2bp: Add Licensing to Android.bp"
Mohannad Farrag   authored and   Gerrit Code Review   commited 2023-01-18 11:56:36 +00:00
b1b0c6b4d6
gn2bp: Add min_sdk_version to cronet_aml_java
Follow aosp/2384119 change

Test: ./update_results.sh
Change-Id: Iafbaee0dd2acc8d5eeca0de5d5e2b52eb21930a4

Motomu Utsumi   commited 2023-01-16 15:20:35 +09:00
00bebb6dc5
gn2bp: Update desc jsons and Android.bp.swp
Generate desc jsons with aosp/2390518

Test: ./update_results.sh
Change-Id: I468d218b114eea48c5c1457ffa31b50c4be451bf

Motomu Utsumi   commited 2023-01-16 15:18:38 +09:00
3fb4566fcb
gn2bp: Update desc.json and Android.bp with is_build_cronet=true
is_build_cronet=true is required by aosp/2384115
This CL also updates gen_desc_json.sh to set is_build_cronet=true

Test: gen_desc_json.sh, update_results.sh
Change-Id: I057a7b9d4bb2038f430c1dbc59de72ba18bdf93c

Motomu Utsumi   commited 2023-01-12 18:20:56 +09:00
edf300c010
gn2bp: Update desc json and Android.bp.swp
Generated desc json with aosp/2385877

Test: ./update_results.sh
Test: TH with aosp/2385878
Change-Id: I0210f2e93c144457c6404073c6011b3b4ffcba09

Motomu Utsumi   commited 2023-01-12 15:30:20 +09:00
d6015fb969
gn2bp: update Android.bp.swp
Test: ./update_results.sh
Change-Id: I872d015156184a8e6dd91e494ffc446678f6cc26

Motomu Utsumi   commited 2023-01-12 13:16:31 +09:00
15c0873fc7
Drop AndroidX dependency
Cronet in AOSP doesn't require AndroidX. The only remaning use of
AndroidX upstream is BuildCompat#isAtLeastT, but here that makes use of
SdkLevel#isAtLeastT.

Test: ./update_result.sh && m
Change-Id: I46634e62f875072347b21235a695ebca6b03e3b5

Stefano Duo   authored and   Motomu Utsumi   commited 2023-01-12 13:16:16 +09:00
09f5523b9c
Merge "Now that Multidex is testonly, drop android-support-multidex"
Motomu Utsumi   authored and   Gerrit Code Review   commited 2023-01-12 04:03:44 +00:00
1fedd9fee1
Now that Multidex is testonly, drop android-support-multidex
Test: ./update_result.sh && m
Change-Id: I0e28f27c56627c3576859971ae8ce35030da6b91

Stefano Duo   commited 2023-01-11 16:00:15 +00:00
faef8bc112
gn2bp: Add JNI jarjaring prefix
* Add the prefix to make sure that cronet's implementation still connects correctly through the JNI layer after jarjaring.

Test: atest CtsCronetTestCases
Change-Id: I38cf1aa30b9211d65efc359eb1eae9244dcd7d10

Mohannad Farrag   commited 2023-01-10 16:45:47 +00:00
a4191eb8b2
Merge "cronet: remove apex_available:platform"
Patrick Rohr   authored and   Gerrit Code Review   commited 2023-01-10 15:34:32 +00:00
66e9af6375
cronet: remove apex_available:platform
Remove temporary workaround to b/203203405.

Test: ./update_results.sh
Change-Id: I0457b3e50e5d914eb2c88864710392959619787a

Patrick Rohr   commited 2023-01-10 05:40:38 -08:00
2b3b00efa2
Merge "cronet: Add dependency needed to make use of SdkLevel"
Stefano Duo   authored and   Gerrit Code Review   commited 2023-01-10 11:33:14 +00:00
fd71f69ba4
cronet: Add dependency needed to make use of SdkLevel
Test: m with this CL + aosp/2369503

Change-Id: I867ad377fb98a1645a461dafba79266f0cd58cc3

Stefano Duo   commited 2023-01-10 09:58:46 +00:00
0978c0716e
gn2bp: Add Licensing to Android.bp
* This was generated as per http://go/android-license-faq. `scan_project` binary was used to figure out all of the licenses that exist in `external/cronet` then manual filtering for `UNKNOWN` license.

Test: m
Bug: b/263943025
Change-Id: Ia63a694a2245d0b3fa646402e6adf5a7bbaadfe7

Mohannad Farrag   commited 2023-01-09 15:29:39 +00:00
ce711affcc
cronet: sync Android.bp with aosp/2374763
Test: TH
Change-Id: If1d8cd64d0c6be397fa02c4f91696b692677bdd6

Patrick Rohr   commited 2023-01-09 01:17:42 -08:00
c9f2da9e78
cronet: sync Android.bp with aosp/2374762
Test: TH
Change-Id: Icb16f269855bfaa1abe262dee9ceadafea3cc9ca

Patrick Rohr   commited 2023-01-08 22:47:21 -08:00
7716fafea7
cronet: update desc_*.json
Update desc_*.json to be in-sync with external/cronet.

Test: build
Change-Id: I62499573750e79865cdd522a6d685b7db3d8934b

Patrick Rohr   commited 2023-01-06 04:28:55 -08:00
10f77a996d
gn2bp: Use startswith instead of regex
Test: ./update_results.sh
Change-Id: Ic85de603d6edb3565552731bac60a57961c8aecc

Motomu Utsumi   commited 2023-01-06 11:53:27 +09:00
7841c80557
gn2bp: Remove unused condition for src path filtering
Test: ./update_results.sh
Change-Id: I5731123496490759e5ec3e8f53dd19d8fe6554b4

Motomu Utsumi   commited 2023-01-06 11:53:14 +09:00
4424f34582
gn2bp: Use "out" prefix for src path filtering
instead of "out/test".

Test: ./update_results.sh
Change-Id: I28fd863742f2531bb942a15c636ca311ef45c307

Motomu Utsumi   commited 2023-01-06 11:52:18 +09:00
e5ea57bc4f
Merge "cronet: add script to generate desc_*.json"
Patrick Rohr   authored and   Gerrit Code Review   commited 2023-01-05 15:47:33 +00:00
e54ec746d7
cronet: add script to generate desc_*.json
It's very basic for now.

Test: run the script
Change-Id: Ie848f8da6936f4300ba5ecdc041523440be25e8a

Patrick Rohr   commited 2023-01-05 07:45:43 -08:00
6d722af6f3
gn2bp: remove unnecessary chrome_root_store target
Test: cd external/cronet && mm
Change-Id: Idec19f1364c9dca4d278a33eebf500a4db87f389

Patrick Rohr   commited 2023-01-03 05:27:57 -08:00
7184dce577
gn2bp: Remove empty srcs cc_object from blueprint
* This was failing the pre-submits are cc_objects are compilable modules but they failed to compile due to empty srcs. However, this didn't affect the compilation of Cronet as the empty cc_objects are never in the path of compilation of Cronet because their attributes are propagated up the tree.

Test: m
Change-Id: I7cc87d53d4f460ef4958d5ecfb23ac28662fdbdc

Mohannad Farrag   commited 2022-12-29 11:49:04 +00:00
b6dbca96b6
gn2bp: Use libmediandk to include <media/NdkMediaError.h>
media_ndk_headers is not available to tethering apex.
But header files are available via libmediandk ndk_library

Test: m
Change-Id: I319d9f3a68c64d7b73af68db40d4a509eba59cd3

Motomu Utsumi   commited 2022-12-24 01:15:08 +09:00
dbf2863471
gn2bp: Add cronet_aml_api_java to cronet_aml_java lib
Test: ./update_results.sh
Change-Id: I02fb762d2a4af0fe5b200a9aafc6dee33d3eaed0

Motomu Utsumi   commited 2022-12-24 01:15:02 +09:00
46ec15cdeb
gn2bp: Add filegroup for cronet api
Test: ./update_results.sh
Change-Id: I4f02494448ede2eeefadbbb9c7c4fdf38ede645c

Motomu Utsumi   commited 2022-12-24 01:14:53 +09:00
a0a3dbea5f
gn2bp: Remove api sources from cronet_aml_java
Test: ./update_results.sh
Change-Id: I2d1df64fe312806fc834d58847ba7f041e202fc3

Motomu Utsumi   commited 2022-12-24 01:14:47 +09:00
1002cd851b
gn2bp: Added java group name to java_sources/actions
Test: ./update_results.sh
Change-Id: Ibc2b3152ab68c5b46acff7d19d2c853889fa887c

Motomu Utsumi   commited 2022-12-24 01:14:40 +09:00
ea729d3204
gn2bp: Update is_java_target to java_group_name
This helps to know java_sources/java_actions are in which java group

Test: ./update_results.sh
Change-Id: Iec3fad1aded935a8d17184a2315d7f21b2a803f2

Motomu Utsumi   commited 2022-12-24 01:14:33 +09:00
940cc564a1
gn2bp: remove hardcoded jni_registration denylist
Test: m cronet_aml_java
Change-Id: I1470e1faa64f17729c63082228423f8177798d88

Patrick Rohr   commited 2022-12-22 19:35:06 -08:00
f20b5ed35b
gn2bp: add javacflag to skip GEN_JNI stub generation
This conflicts as the fully-featured GEN_JNI is already generated by
another genrule.

Test: none
Change-Id: I522501444b02d2a304e81d86d86b0c8f3589035c

Patrick Rohr   commited 2022-12-22 19:35:06 -08:00
8d393193c1
gn2bp: use Android libgtest_prod_headers
This requires aosp/2366787 to work.
Unfortunately, Chromium does not add a dependency on gtest, so
builtin_module cannot be used.
Using the gtest prod headers from Android is fine for //base. The only
thing that's used is gtest_prod.h, which includes one friend macro that
hasn't changed in 14 years.

Test: build cronet
Change-Id: I03b12ae698699527da7e69c9d4d50da1822fd5bc

Patrick Rohr   commited 2022-12-22 19:35:06 -08:00
baaf160382
gn2bp: depend on :current_android_jar for JNI generation
Test: update_results.sh
Change-Id: Id08cb64c65cc2f2b2136d6e437ad8af1876da180

Patrick Rohr   commited 2022-12-22 11:39:35 -08:00
7d2cdf44bc
gn2bp: Update tree_path to 'external/cronet'
Test: ./update_results.sh
Change-Id: I63f0bd1645d7b7ac007e1c86668c4719dae6a5f3

Motomu Utsumi   commited 2022-12-22 19:20:01 +09:00
ad6323cd76
gn2bp: Update desc.json from cronet 108.0.5359.128
This CL also update the default_targets to use
//components/cronet/android:cronet_android_mainline

Test: ./update_results.sh
Change-Id: Iae5d61b9abb0136cb077e4341ce7a74e1e08061c

Motomu Utsumi   commited 2022-12-22 18:02:05 +09:00
ddcc9082a2
gn2bp: build against Android's zlib
I guess we can decide if that is what we really want to do long term.
(In which case, we would preferably have a target to link zlib
statically).

Test: builds
Change-Id: Ic5b371059874aa8cac8d24adf9f44925a89bc5a2

Patrick Rohr   commited 2022-12-21 11:19:01 -08:00
3d1059cf2a
gn2bp: Merge cc_genrule cmd
Test: ./update_results.sh
Test: m cronet_aml_components_cronet_android_cronet
Test: m cronet_aml_java
Change-Id: Ib9efad99e87acf47ba88a31bac86dcabd2a40c4f

Motomu Utsumi   commited 2022-12-19 11:11:06 +09:00
3029ac9fc3
gn2bp: Remove arch suffix from the genrule
This CL makes gn2bp ignore the arch difference in genrule and breaks the
build.
Next CL fixes this by properly merging arch specific cmd for cc_genrule.
Splitting CL to make the Android.bp.swp diff in the next CL readable.

Test: ./update_results.sh
Change-Id: I2d74e91cab5782a3ce9de51a0fa0c9c5c21bf8bf

Motomu Utsumi   commited 2022-12-19 11:10:58 +09:00
e74bab885b
gn2bp: Support merging genrule
Test: ./update_results.sh
Change-Id: I2551ec2f333805820eca6c85bbbde4be28787d04

Motomu Utsumi   commited 2022-12-19 11:10:58 +09:00
877e6f0a77
gn2bp: Add function to merge modules
Test: ./update_results.sh
Change-Id: I274243769e366f41b129365c8f4ee89d0e1bf929

Motomu Utsumi   commited 2022-12-19 11:10:58 +09:00
822bfc4143
gn2bp: Add function to merge cmd for genrule
Test: ./update_results.sh
Change-Id: Ic45b83728f72277949b82fcda062f5d4c83f0717

Motomu Utsumi   commited 2022-12-19 11:10:58 +09:00
d32f9aa136
gn2bp: Add helper function to get condition for arch
This function return the condition which can be used within the cmd in
the cc_genrule

Test: ./update_results.sh
Change-Id: Ib36bfed7f37a8d86d2dddd12c4fca31477ebd6ee

Motomu Utsumi   commited 2022-12-19 11:10:58 +09:00
170cc2de7e
gn2bp: Update sanitizer to accept arch specific attributes
Test: ./update_results.sh
Change-Id: Ic1fbc420aeff630485503f5fe32c8c8435e15f60

Motomu Utsumi   commited 2022-12-19 11:10:58 +09:00
0facea583d
gn2bp: Add action attributes to arch
These arch dependent attributes are not used yet.

Test: ./update_results.sh
Change-Id: I871fcdb51a7fa48503430970721f019e90fda484

Motomu Utsumi   commited 2022-12-19 11:10:58 +09:00
2165ccddcf