LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,837 Commits 2 Branches 0 Tags
21a8382038c20049399d60ccd0cb1519d3d97642
Commit Graph

31837 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joel Galenson
112bf41e03 Merge changes Icdf88bc3,I368e905a am: d3675725b8 am: d354d0a15b am: c7b2dbbfc5 am: c0fa97d55c 
Original change: https://android-review.googlesource.com/c/platform/development/+/1797049

Change-Id: If9de2cddf1b6424395c27ebc4694095d8bdba1f8
 2021-08-17 01:06:30 +00:00
Joel Galenson
c0fa97d55c Merge changes Icdf88bc3,I368e905a am: d3675725b8 am: d354d0a15b am: c7b2dbbfc5 
Original change: https://android-review.googlesource.com/c/platform/development/+/1797049

Change-Id: I4d8d68105abf29b7869ad752243a93caba02bd21
 2021-08-17 00:51:55 +00:00
Joel Galenson
c7b2dbbfc5 Merge changes Icdf88bc3,I368e905a am: d3675725b8 am: d354d0a15b 
Original change: https://android-review.googlesource.com/c/platform/development/+/1797049

Change-Id: Ibfaf1fdb7940bab487496e1f79692170902227b6
 2021-08-17 00:35:13 +00:00
Joel Galenson
d354d0a15b Merge changes Icdf88bc3,I368e905a am: d3675725b8 
Original change: https://android-review.googlesource.com/c/platform/development/+/1797049

Change-Id: I51fddaa0a19a8812a426b212e33aae8b532b462f
 2021-08-17 00:17:00 +00:00
Joel Galenson
d3675725b8 Merge changes Icdf88bc3,I368e905a 
* changes:
  Improve package version logic
  Fixes for getting package version
 2021-08-16 23:44:33 +00:00
Joel Galenson
69ba807921 Improve package version logic 
Only run cargo metadata on the main crate, not all of its dependencies.

Pass it the --format-version argument to avoid a warning and be
future-proof.

Test: Run.
Change-Id: Icdf88bc3b633d18266772ae813fc04b529b95765
 2021-08-16 11:31:29 -07:00
Joel Galenson
c51865074b Fixes for getting package version 
Older versions of Python's subprocess do not have capture_output, so
just get stdout directly.

Also pass the full path to cargo in case it is not on PATH.

Test: Run
Change-Id: I368e905a93b344bca6635c6ab7a60def809e88d5
 2021-08-16 11:22:47 -07:00
Ivan Lozano
c72fd3b92c Merge "cargo2android: Improve package version logic" am: e203a54627 am: cf80af0416 am: eaedf52e58 am: 3e4a17e547 
Original change: https://android-review.googlesource.com/c/platform/development/+/1796769

Change-Id: I9fb158835f8229835e900fedb854bc15e5240c39
 2021-08-16 17:57:39 +00:00
Ivan Lozano
3e4a17e547 Merge "cargo2android: Improve package version logic" am: e203a54627 am: cf80af0416 am: eaedf52e58 
Original change: https://android-review.googlesource.com/c/platform/development/+/1796769

Change-Id: If81eaa9993ee2ab6d21cb5b94f0d5c1315fa2d2f
 2021-08-16 17:43:54 +00:00
Ivan Lozano
eaedf52e58 Merge "cargo2android: Improve package version logic" am: e203a54627 am: cf80af0416 
Original change: https://android-review.googlesource.com/c/platform/development/+/1796769

Change-Id: I9f634f21ba4ff097f404a2f6347d57f67ffc19d6
 2021-08-16 17:25:56 +00:00
Ivan Lozano
cf80af0416 Merge "cargo2android: Improve package version logic" am: e203a54627 
Original change: https://android-review.googlesource.com/c/platform/development/+/1796769

Change-Id: I4dc4c87634958069fcf1c99b7305e14e920c910c
 2021-08-16 17:11:40 +00:00
Ivan Lozano
e203a54627 Merge "cargo2android: Improve package version logic" 2021-08-16 17:01:47 +00:00
Ivan Lozano
26aa1c30d2 cargo2android: Improve package version logic 
If there are multiple packages present in the workspace, attempt
to determine what the current package is by checking the emitted
crate_name value against the package name. If this still fails, a new
`--no-pkg-vers` flag is added to skip this behavior.

Bug: 196803495
Test: New logic finds package if package.name is used for crate_name
Test: New flag prevents emitting the pkg version.
Change-Id: I152e94a0520f09f37622a6cec340ae35842d56ea
 2021-08-16 11:37:28 -04:00
Xin Li
f631d20429 Merge sc-dev-plus-aosp-without-vendor@7634622 
Merged-In: I815ef03c93bec8be2340dc340d840895f47ecafe
Change-Id: I2f6316055af5cb77c66ff2a741a2d37db3d1691a
 2021-08-14 06:31:09 +00:00
Ivan Lozano
328bb4167c Merge "cargo2android.py: Support cargo_pkg_version flag." am: d90e7066f6 am: cc0c71dc81 am: 9521c8a41c am: 181f566814 
Original change: https://android-review.googlesource.com/c/platform/development/+/1793668

Change-Id: I0ab0885715ad3959ee0a8ec40b51f5ec1a55553d
 2021-08-13 13:58:06 +00:00
Ivan Lozano
181f566814 Merge "cargo2android.py: Support cargo_pkg_version flag." am: d90e7066f6 am: cc0c71dc81 am: 9521c8a41c 
Original change: https://android-review.googlesource.com/c/platform/development/+/1793668

Change-Id: Ib357e4f8f6d4af9b8c2239bbe5ed62e8bac41148
 2021-08-13 13:26:18 +00:00
Ivan Lozano
9521c8a41c Merge "cargo2android.py: Support cargo_pkg_version flag." am: d90e7066f6 am: cc0c71dc81 
Original change: https://android-review.googlesource.com/c/platform/development/+/1793668

Change-Id: Ibc4cb0a638b0bd9c67d103546a35126780647b42
 2021-08-13 13:11:55 +00:00
Ivan Lozano
cc0c71dc81 Merge "cargo2android.py: Support cargo_pkg_version flag." am: d90e7066f6 
Original change: https://android-review.googlesource.com/c/platform/development/+/1793668

Change-Id: I0bf9833da1070a01a5721a86282cc1f3502393b3
 2021-08-13 12:56:36 +00:00
Ivan Lozano
d90e7066f6 Merge "cargo2android.py: Support cargo_pkg_version flag." 2021-08-13 12:33:51 +00:00
Kelvin Zhang
7c66bb6542 Merge "Fix a bug where small manifest isn't read" am: 62582263a2 am: 6750cd8b02 am: d5764b5753 am: b6debb366b 
Original change: https://android-review.googlesource.com/c/platform/development/+/1792911

Change-Id: I4c5299137aa29476784277a6f437fb420f3a63bc
 2021-08-12 19:02:08 +00:00
Treehugger Robot
76559b2f42 Merge "Add test to ota_interface.ProcessManagement." am: 4a5ee938da am: 85e6dea009 am: 3a894fb3c2 am: ebc318c424 
Original change: https://android-review.googlesource.com/c/platform/development/+/1793173

Change-Id: Ie6c7923a1e76c3c60119364b4e07c5a903ec5548
 2021-08-12 18:55:39 +00:00
Kelvin Zhang
b6debb366b Merge "Fix a bug where small manifest isn't read" am: 62582263a2 am: 6750cd8b02 am: d5764b5753 
Original change: https://android-review.googlesource.com/c/platform/development/+/1792911

Change-Id: Ibe0c28010528707cda2ad8a27d3e25999b4f917e
 2021-08-12 18:45:53 +00:00
Kelvin Zhang
d5764b5753 Merge "Fix a bug where small manifest isn't read" am: 62582263a2 am: 6750cd8b02 
Original change: https://android-review.googlesource.com/c/platform/development/+/1792911

Change-Id: If724cf9d9bad6143f0534b5cf5512b5b9f5a23be
 2021-08-12 18:32:03 +00:00
Kelvin Zhang
6750cd8b02 Merge "Fix a bug where small manifest isn't read" am: 62582263a2 
Original change: https://android-review.googlesource.com/c/platform/development/+/1792911

Change-Id: I30fa5befab82f758f2d7302800c4b3bc18bc7869
 2021-08-12 18:15:48 +00:00
Kelvin Zhang
62582263a2 Merge "Fix a bug where small manifest isn't read" 2021-08-12 17:36:03 +00:00
Treehugger Robot
ebc318c424 Merge "Add test to ota_interface.ProcessManagement." am: 4a5ee938da am: 85e6dea009 am: 3a894fb3c2 
Original change: https://android-review.googlesource.com/c/platform/development/+/1793173

Change-Id: Ie5c4c7ccf379cbf0c2239d4cb6b0bb9a436d5b75
 2021-08-12 17:34:28 +00:00
Kelvin Zhang
c05d0bd37c Fix a bug where small manifest isn't read 
If a single read request contains the entire manifest, we will return
right after prefixLength is computed, and the UI just hangs there.

Test: load a small OTA pkg
Change-Id: Idb93fdba103f9c6e7b14974b45d1aecdb2ae9168
 2021-08-12 10:32:07 -07:00
Treehugger Robot
3a894fb3c2 Merge "Add test to ota_interface.ProcessManagement." am: 4a5ee938da am: 85e6dea009 
Original change: https://android-review.googlesource.com/c/platform/development/+/1793173

Change-Id: Iae4640fecea1f175dcc730c701c9cc26ded68f46
 2021-08-12 17:15:09 +00:00
Ivan Lozano
cc660f1d75 cargo2android.py: Support cargo_pkg_version flag. 
This parses a module's Cargo.toml file for package version number,
setting it to cargo_pkg_version. Also sets cargo_env_compat true by
default.

Bug: 171011485
Test: generated Android.bp includes cargo_env_compat, cargo_pkg_version.
Change-Id: Ibb8021633719650e2021b90806374a5d3c6a161a
 2021-08-12 13:04:25 -04:00
Treehugger Robot
85e6dea009 Merge "Add test to ota_interface.ProcessManagement." am: 4a5ee938da 
Original change: https://android-review.googlesource.com/c/platform/development/+/1793173

Change-Id: I1a95fc0f3058052e25ead1ae7f1172029e68288e
 2021-08-12 16:51:48 +00:00
Treehugger Robot
4a5ee938da Merge "Add test to ota_interface.ProcessManagement." 2021-08-12 16:37:32 +00:00
Treehugger Robot
e6a368c75f Merge "Add test to ota_interface.JobInfo." am: ba7d668e84 am: 42f7ba7bc8 am: 307faa3b5f am: 4535d298e4 
Original change: https://android-review.googlesource.com/c/platform/development/+/1793172

Change-Id: I06465fd059ee4d88cea3a01b19edbb575abd3176
 2021-08-12 15:21:04 +00:00
Treehugger Robot
4535d298e4 Merge "Add test to ota_interface.JobInfo." am: ba7d668e84 am: 42f7ba7bc8 am: 307faa3b5f 
Original change: https://android-review.googlesource.com/c/platform/development/+/1793172

Change-Id: I3a3eb6e27aa0d21854911df70ac581d54e090f17
 2021-08-12 14:42:42 +00:00
Treehugger Robot
307faa3b5f Merge "Add test to ota_interface.JobInfo." am: ba7d668e84 am: 42f7ba7bc8 
Original change: https://android-review.googlesource.com/c/platform/development/+/1793172

Change-Id: Ia252d6871d21fcf010fe10db477ceb8f99d6be06
 2021-08-12 14:24:21 +00:00
Treehugger Robot
42f7ba7bc8 Merge "Add test to ota_interface.JobInfo." am: ba7d668e84 
Original change: https://android-review.googlesource.com/c/platform/development/+/1793172

Change-Id: I8451f3fbd5fe0a52bf94fa9f1851b3f384306b4e
 2021-08-12 14:11:24 +00:00
Treehugger Robot
ba7d668e84 Merge "Add test to ota_interface.JobInfo." 2021-08-12 13:58:27 +00:00
Treehugger Robot
4537095627 Merge changes I8449eea7,I24666871 am: 5d8768f2ca am: 303ca2baa8 am: 4bb39c56da am: 28af1c725d 
Original change: https://android-review.googlesource.com/c/platform/development/+/1793171

Change-Id: I81e3fd1198482b50508403673a7006121a622907
 2021-08-12 01:54:12 +00:00
Treehugger Robot
28af1c725d Merge changes I8449eea7,I24666871 am: 5d8768f2ca am: 303ca2baa8 am: 4bb39c56da 
Original change: https://android-review.googlesource.com/c/platform/development/+/1793171

Change-Id: I8080f780a51655bc33e455ba0d5c88ad58b9a973
 2021-08-12 01:31:21 +00:00
Treehugger Robot
4bb39c56da Merge changes I8449eea7,I24666871 am: 5d8768f2ca am: 303ca2baa8 
Original change: https://android-review.googlesource.com/c/platform/development/+/1793171

Change-Id: I815ef03c93bec8be2340dc340d840895f47ecafe
 2021-08-12 01:16:26 +00:00
Treehugger Robot
303ca2baa8 Merge changes I8449eea7,I24666871 am: 5d8768f2ca 
Original change: https://android-review.googlesource.com/c/platform/development/+/1793171

Change-Id: Ib5c9d0985bee95bb5ef8a0058bf715bd0c344486
 2021-08-12 01:00:27 +00:00
Treehugger Robot
5d8768f2ca Merge changes I8449eea7,I24666871 
* changes:
  Fix a small bug when initialize a ota generation.
  Add jest to dependency.
 2021-08-12 00:47:38 +00:00
lishutong
70026190c6 Add test to ota_interface.ProcessManagement. 
The ProcessManagement helps initiate OTA generation processes and
monitor those processes. Add some test and comments to this class.
Please refer to:
https://android-review.googlesource.com/c/platform/development/+/1736940
for more details.

Test: python test_ota_interface.py -v
Change-Id: Ib22fca4c5a670f8b55db8a4175fef16d92eaceaf
 2021-08-12 00:44:42 +00:00
lishutong
1e82f06150 Add test to ota_interface.JobInfo. 
Add testcases for ota_interface.JobInfo, which is used as object to
store task information and serve/read data to/from database.
Refer to:
https://android-review.googlesource.com/c/platform/development/+/1736940
for more details.

Test: python test_ota_interface.py -v
Change-Id: I74dcb16390078bd9258da490e21cb2b73dd78e81
 2021-08-11 20:45:23 +00:00
lishutong
ec3b42deea Fix a small bug when initialize a ota generation. 
The os.path.join() will bring in an unwanted backslash.

Test: Tested by starting a new OTA generation process by calling
ota_interface.ota_generate directly.
Test: python test_ota_interface.py -v

Change-Id: I8449eea79303f5aff5188176538eca1291101dff
 2021-08-11 20:24:55 +00:00
lishutong
400253b224 Add jest to dependency. 
Jest is a JavaScript test framework. Test-utils is used to test vue
components.

No-Typo-Check: auto-generated artifacts

Test: npm run test.
Change-Id: I2466687120b96a3a393299d127c6d7e1f15204e7
 2021-08-11 20:24:55 +00:00
Treehugger Robot
ee94e7423a Merge changes from topic "soong-clang-version-fix" am: 39f573eb00 am: 85737b03d0 am: 7cae26565e am: 8cfc22295a 
Original change: https://android-review.googlesource.com/c/platform/development/+/1788868

Change-Id: I83d2bd1e1501fc8ef4615af44d37b4a531e712a0
 2021-08-11 07:57:03 +00:00
Pirama Arumuga Nainar
99935f7825 [scripts] Adjust FindClangDir am: a26dc346dd am: fb3953027f am: 6f7885e592 am: b69ae81350 
Original change: https://android-review.googlesource.com/c/platform/development/+/1788867

Change-Id: Iee431bfd836d0bd20132e8e3b33880bf405e0a9b
 2021-08-11 07:57:01 +00:00
Treehugger Robot
8cfc22295a Merge changes from topic "soong-clang-version-fix" am: 39f573eb00 am: 85737b03d0 am: 7cae26565e 
Original change: https://android-review.googlesource.com/c/platform/development/+/1788868

Change-Id: I6efc84dfd4c2ef043b30d6e9fba63534cdbda8b3
 2021-08-11 07:40:22 +00:00
Pirama Arumuga Nainar
b69ae81350 [scripts] Adjust FindClangDir am: a26dc346dd am: fb3953027f am: 6f7885e592 
Original change: https://android-review.googlesource.com/c/platform/development/+/1788867

Change-Id: Iaf8af3c3a0b9fdd99523b4778a04e23118f2ed78
 2021-08-11 07:40:19 +00:00
Treehugger Robot
7cae26565e Merge changes from topic "soong-clang-version-fix" am: 39f573eb00 am: 85737b03d0 
Original change: https://android-review.googlesource.com/c/platform/development/+/1788868

Change-Id: I1f3051c7c94535b967a4a47eea09ad70d2ca4667
 2021-08-11 07:26:46 +00:00