Mohannad Farrag
c1a0d619fc
gn2bp: Generate a copy of 'cronet_jni_registration' for java
...
cronet_jni_registration is a cc_genrule that produces both C++ header file and java jar. So this copies the cronet_jni_registration cc module and tweak it to fit the java_library
Test: m cronet_aml_components_cronet_android_cronet
Change-Id: I3ae20595c84ab32ae33268e2af79aead3f2d35c4
2022-12-01 17:58:37 +00:00
Mohannad Farrag
b73ce0fbaa
gn2bp: Fix args formatting for java_cpp_enum.py script
...
Test: None
Change-Id: I24aaf62e7cc8ba94f5f43d3069689d5ed4579f73
2022-12-01 17:58:32 +00:00
Mohannad Farrag
8fa90658f5
gn2bp: Move 'sanitize_version_filepath' to base class
...
This method is needed for another subclass so it's better to move it to the base class and change the name.
Test: None
Change-Id: I763a5d30d9b35b585914f1c8dbb2d5989e1d55d6
2022-12-01 17:58:29 +00:00
Mohannad Farrag
7ff99910f7
gn2bp: Create java_genrule from java actions
...
* Actions whose outputs are "srcjar" and ".java" files only are converted into a `java_genrule` instead of `cc_genrule`. The only exception to this is the jni_registration_module which produces a header file and a srcjar, it's kept a cc_genrule but deep-copied by create_java_module to have a java_genrule copy.
Test: None
Change-Id: I07270c9a7984a8fd26a53ca614287a3a646d65d6
2022-12-01 17:58:19 +00:00
Mohannad Farrag
6a2d88a9b3
gn2bp: Convert java_actions to java_group
...
* This converts all of the `actions` whose script is in the list of `JAVA_BANNED_SCRIPTS` into a `java_group`. `java_group` don't have dependencies but all of the actions reachable through them are stored.
Test: m cronet_aml_components_cronet_android_cronet
Change-Id: Ib91dfdd6789fc25466e298a4a274e224fe08b5e9
2022-12-01 17:54:14 +00:00
Mohannad Farrag
303dddb5d1
gn2bp: Remove redundant checks
...
Test: m cronet_aml_components_cronet_android_cronet
Change-Id: I500bc398163b745eadc733c8773c0d668eb4675e
2022-12-01 17:54:13 +00:00
Mohannad Farrag
631bcb9e27
Merge changes Ib1d201b5,Ib43f7f45,Ifdae480f,Icc411534,I98a31358, ... am: dafc849477
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2323286
Change-Id: I1fcaf5cfebd987fcf7e8d000460021b40cc7fa1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-01 13:38:16 +00:00
Mohannad Farrag
dafc849477
Merge changes Ib1d201b5,Ib43f7f45,Ifdae480f,Icc411534,I98a31358, ...
...
* changes:
gn2bp: Merge if block which is splitted without necessity
gn2bp: Fix _sanitize_eval_arg and remove workaround codes
gn2bp: sanitize eval arg from VersionSanitizer
gn2bp: sanitize file path from VersionSanitizer
gn2bp: Move output arg to VersionSanitizer
gn2bp: Add VersionSanitizer
gn2bp: Move --sources-exclusions to JniRegistrationGeneratorSanitizer
gn2bp: Move --sources-files to JniRegistrationGeneratorSanitizer
gn2bp: Move file path sanitize to the JniRegistrationGeneratorSanitizer
gn2bp: Add JniRegistrationGeneratorSanitizer
gn2bp: Move --input_file to JniGeneratorSanitizer
gn2bp: Add _update_list_arg
gn2bp: Update the definition of value arg and list arg
2022-12-01 13:17:16 +00:00
Hungming Chen
1dbc674e13
Test: decouple the tests which access class member variables directly
...
This is a preparation for breaking down EthernetTetheringTest into
CTS and MTS tests.
EthernetTetheringTest is going to separate test base class and
derived class. In order to encapsulate base class better, decouple
the following tests which access member variables directly.
- testStaticIpv4
- testLocalOnlyTethering
- testPhysicalEthernet
- testVirtualEthernet
- testVirtualEthernetAlreadyExists
Above tests change to use local veriables instead of class member
variables: mDownstreamReader, mDownstreamIface,
mTetheringEventCallback, mTetheredInterfaceRequester.
This can help to decouple the tests with class member variables and
these class member variables can be private in the
base class EthernetTetheringTestBase since the following commit.
Bug: 250552545
Bug: 258637850
Test atest EthernetTetheringTest
Change-Id: Ifd855571337b34c1dfee5cb2791369de754bc94d
2022-12-01 18:54:23 +08:00
Motomu Utsumi
747030bfc6
gn2bp: Merge if block which is splitted without necessity
...
Test: ./update_results.sh
Change-Id: Ib1d201b5288f1b81685e7097d83dc7e5cec70e0b
2022-12-01 19:25:01 +09:00
Motomu Utsumi
297c29b2de
gn2bp: Fix _sanitize_eval_arg and remove workaround codes
...
Test: ./update_results.sh
Change-Id: Ib43f7f45152c8c4f13db51cd568760db0116a118
2022-12-01 19:25:01 +09:00
Motomu Utsumi
0f368574c0
gn2bp: sanitize eval arg from VersionSanitizer
...
Test: ./update_results.sh
Change-Id: Ifdae480fa013e96413ae9eaf29c81c877198962b
2022-12-01 19:25:01 +09:00
Motomu Utsumi
21485baaa4
gn2bp: sanitize file path from VersionSanitizer
...
Test: ./update_results.sh
Change-Id: Icc411534d8940ad88e6bd39af81c54708c76ffd1
2022-12-01 19:25:01 +09:00
Motomu Utsumi
c6b08b8638
gn2bp: Move output arg to VersionSanitizer
...
Test: ./update_results.sh
Change-Id: I98a3135831ac5b46cfec9d32b75c1296ba8c5e35
2022-12-01 19:25:01 +09:00
Motomu Utsumi
6af5b2ad93
gn2bp: Add VersionSanitizer
...
Test: ./update_results.sh
Change-Id: I3ac0b96e71fcd80160763e63a46a0117b74ef255
2022-12-01 19:25:01 +09:00
Motomu Utsumi
4fe0b95c63
gn2bp: Move --sources-exclusions to JniRegistrationGeneratorSanitizer
...
Test: ./update_results.sh
Change-Id: I38f39ab2a3eb391fde88a2d4ef57ed1e68a9f2c9
2022-12-01 19:25:01 +09:00
Motomu Utsumi
5590747b69
gn2bp: Move --sources-files to JniRegistrationGeneratorSanitizer
...
Test: ./update_results.sh
Change-Id: I5a9fea4fcbefb00bccf4de9ca75059cdede1f8d5
2022-12-01 19:25:01 +09:00
Motomu Utsumi
28cbf2f4c2
gn2bp: Move file path sanitize to the JniRegistrationGeneratorSanitizer
...
Test: ./update_results.sh
Change-Id: I3bb881b2f9ba2801dec9c137b6b53cb8dcc6f991
2022-12-01 19:25:01 +09:00
Motomu Utsumi
b80903c21c
gn2bp: Add JniRegistrationGeneratorSanitizer
...
Test: ./update_results.sh
Change-Id: I39837e78d7c1a102a8a82d816a4e23f824629277
2022-12-01 19:25:01 +09:00
Motomu Utsumi
4d551d733c
gn2bp: Move --input_file to JniGeneratorSanitizer
...
Test: ./update_results.sh
Change-Id: Icb00e7b33895ac35598ac6a5800854023781b7a9
2022-12-01 19:25:01 +09:00
Motomu Utsumi
c363b41d85
gn2bp: Add _update_list_arg
...
Test: ./update_results.sh
Change-Id: I0dd28052ba5d121d4e55e37df520296271bb8d4b
2022-12-01 19:25:01 +09:00
Motomu Utsumi
923688c8fa
gn2bp: Update the definition of value arg and list arg
...
Test: ./update_results.sh
Change-Id: Id30438b7c3051387c04e20e6a80d69a8733885b0
2022-12-01 19:24:57 +09:00
Aaron Huang
cdb3d4b0ba
Merge "Remove unused methods from NetworkTemplate" am: 23d8cd11c7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2286634
Change-Id: I4b6e2e8825b249009414c857433053255e25fb72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-01 06:25:33 +00:00
Aaron Huang
23d8cd11c7
Merge "Remove unused methods from NetworkTemplate"
2022-12-01 05:56:26 +00:00
Patrick Rohr
2a5f05b190
gn2bp: add back a comment am: 8bcd783eae
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2319243
Change-Id: I831fb1aa8817d26bede658d7d241486cf0662052
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-01 04:47:36 +00:00
Patrick Rohr
f4894b3476
gn2bp: clean up _delete_arg am: 357b25cd23
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2321946
Change-Id: I20d134630a2a623d7d70e8f8fa311cb5e05f0ca5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-01 04:47:33 +00:00
Patrick Rohr
4eb9f91306
gn2bp: add throw_if_absent parameter to some helper functions am: f0abead137
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2321945
Change-Id: I66fccfe13f6b83e5d32ce0c8651ee2e6eaa2e421
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-01 04:47:32 +00:00
Patrick Rohr
6a50dbaaca
gn2bp: rename _sanitize_dir to _sanitize_filepath am: 872a2816a0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2321944
Change-Id: Id0ca87173281495cd769b028e55e466d778ea800
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-01 04:47:29 +00:00
Patrick Rohr
8bcd783eae
gn2bp: add back a comment
...
Comment was deleted during a previous refactoring step.
Test: none
Change-Id: I1f4d3d1915122bdaed65bfdc0c58e63a1f41d5d3
2022-11-30 19:48:56 -08:00
Patrick Rohr
357b25cd23
gn2bp: clean up _delete_arg
...
This previously supported deleteing flags or value args. Deleting flags
may not be required (and if it is, we can always add a second function).
I prefer having a simpler implementation at the cost of little
duplication.
Test: none
Change-Id: Ice16dd54185c65fec99882ff65e982804478c85f
2022-11-30 19:46:26 -08:00
Patrick Rohr
f0abead137
gn2bp: add throw_if_absent parameter to some helper functions
...
This is much more explicit and should hopefully help us catch errors /
upstream changes early.
Test: none
Change-Id: I4379bbf35d64c5f922a34cdd2f24c6bf03983a94
2022-11-30 19:44:10 -08:00
Patrick Rohr
872a2816a0
gn2bp: rename _sanitize_dir to _sanitize_filepath
...
Test: none
Change-Id: I8f6d7e92df94c72ff07eab23e81ac45aa2306bdb
2022-11-30 19:28:22 -08:00
Patrick Rohr
2d9916020f
gn2bp: move jni_generator.py --jar_file to sanitizer am: fda02673e4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2323063
Change-Id: I50a0721d2ded4cd6cba04333ae2ef238ddd76a11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-01 03:08:46 +00:00
Patrick Rohr
4efe1fa35e
gn2bp: move jni_generator.py --prev_output_dir to sanitizer am: 9f439321d8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2323062
Change-Id: I4b5b28b8405567674d83c53136af02fa045363e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-01 03:08:44 +00:00
Patrick Rohr
91d976cb78
gn2bp: move jni_generator.py --includes to sanitizer am: 9e5a3c7c74
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2323061
Change-Id: I2830f6d10647968d0db1e7b600772e23b754e9e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-01 03:08:41 +00:00
Patrick Rohr
a0482c7be2
gn2bp: some functions should fail silently am: 4d74aedfb0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2323060
Change-Id: I4ba57c0fc329c85460ee6200036d892d12f28b51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-01 03:08:39 +00:00
Patrick Rohr
c1dab9e38a
gn2bp: move jni_generator.py --output_dir to sanitizer am: 3e374ef0f2
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2323059
Change-Id: I275e8c8493349da10d6a0f21a9356b1b331b9d04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-01 03:08:37 +00:00
Patrick Rohr
e99b4e6e5a
gn2bp: try to put all common path operations in one function am: 0e24c5fd51
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2323058
Change-Id: If8abe2f5b259a6ba42c5953c62a3caad3a93ee07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-01 03:08:35 +00:00
Patrick Rohr
1c13fe697a
gn2bp: add update value arg support am: 1bedf6ca4e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2323057
Change-Id: Idfbd602a29bcdc1a65f08b3de14a6d231165e233
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-01 03:08:33 +00:00
Patrick Rohr
41cc6b3094
gn2bp: name helper functions more consistently am: 2cad933ab6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2323056
Change-Id: I571d338dbe561caf28dbf8d6d034d400cb4b9383
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-01 03:08:31 +00:00
Patrick Rohr
335ed5b507
gn2bp: rename _has_arg_value to _is_value_arg am: ef4f2bf7e4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2323055
Change-Id: I3b17c2fc8838e756ee7fa929c1225dedb9ed5dc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-01 03:08:29 +00:00
Patrick Rohr
51c0f33924
gn2bp: move get_action_sanitizer below code it references am: 7f11715cd4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2323054
Change-Id: I1d3b5e59f0e95c9473ff2719534fabedbc918e83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-01 03:08:26 +00:00
Patrick Rohr
448731c822
gn2bp: add jni_generator.py sanitizer am: 0242a3f996
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2323053
Change-Id: I7d84dcc667db210ea18964bd85add17bb34709aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-01 03:08:24 +00:00
Patrick Rohr
a5d732622b
gn2bp: add _append_arg helper am: 1f7dd583bb
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2321930
Change-Id: I2949c8e4f7bcc2deaa02378ede437e63d0786a7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-01 03:08:22 +00:00
Patrick Rohr
2381995458
gn2bp: fix arg sanitization am: 3d37780e5d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2321929
Change-Id: Icacf8bf45fdba8d5505954e1c356bead8b8fe8de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-01 03:08:20 +00:00
Patrick Rohr
9068e5abc4
gn2bp: rename _is_append_arg for clarity am: 501af22acd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2321928
Change-Id: If6d52ae4c88e62d96e9dab9f783d172b594c122e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-01 03:08:17 +00:00
Patrick Rohr
9c9b1d31e0
gn2bp: fix _rebase_directory am: 15aa692d20
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2321927
Change-Id: Ifbc0c7a62c3aca22faa42d8307720f39498b3891
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-01 03:08:15 +00:00
Patrick Rohr
fbc93a73b8
gn2bp: rename _set_arg_positional_value for readability am: 77c4f5c602
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2321926
Change-Id: I950f2faee63a3aabbb483f2a09aed3cd63bd3bc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-01 03:08:13 +00:00
Patrick Rohr
7db504ec6f
gn2bp: rename getSanitizer for consistency am: d7de3dd714
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2321925
Change-Id: I8d757b31f51f9badf359c055c972cad151591d0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-01 03:08:11 +00:00
chiachangwang
18a6e8cf2f
Ensure calling package and UID synchronized while calling dump()
...
This commit clear the calling identity before accessing the
DeviceConfig in ConnectivityService#dump().
The calling package of DeviceConfig.getProperties() comes from
ActivityThread.currentApplication(). In ConnectivityService#dump(),
the caller is ConnectivityService. It's OK to access DeviceConfig
from ConnectivityService. The same scenario applies to an app with
proper permission accessing DeviceConfig from its own context.
However, if cts would like to verify design by calling
ConnectivityService#dump(), the calling uid will comes from the
binder but package name will stay as ConnectivityService which
is 'android'. This will result in a SecurityException says that
the package does not match the uid and failed the test.
Bug: 255231779
Test: atest CtsNetTestCases FrameworksNetTests
Change-Id: I257e246b1cbf3b8a93bee2c326055ced9dfde588
2022-12-01 00:22:34 +00:00