Commit Graph

31200 Commits

Author SHA1 Message Date
Treehugger Robot
591d74c695 Merge changes Ie5a1d85f,I0aa9acfb,I19f0abe3,I0877e2d7 am: b58311f3b6 am: bf443c909f
Original change: https://android-review.googlesource.com/c/platform/development/+/1798414

Change-Id: Id6dcbd7bc37d3da22e9fe6af1d82e9d2aaf32e1b
2021-08-18 01:11:27 +00:00
Treehugger Robot
bf443c909f Merge changes Ie5a1d85f,I0aa9acfb,I19f0abe3,I0877e2d7 am: b58311f3b6
Original change: https://android-review.googlesource.com/c/platform/development/+/1798414

Change-Id: Ied87b898983e1fc3faf1de66a29660b4652d34be
2021-08-18 00:56:00 +00:00
Treehugger Robot
b58311f3b6 Merge changes Ie5a1d85f,I0aa9acfb,I19f0abe3,I0877e2d7
* changes:
  cargo2android: Don't emit image support for tests
  cargo2android: Support exported C headers
  cargo2android: Emit apex_available + min_sdk_version for native libs
  cargo2android: Add support for various image types
2021-08-18 00:30:38 +00:00
Matthew Maurer
70182e44f0 cargo2android: Don't emit image support for tests
Image support doesn't make sense for test modules.

Bug: 178565008
Test: Generate rustc-demangle-capi
Change-Id: Ie5a1d85f9828e0c105c3a3e994b22ef7664fe1db
2021-08-17 15:36:38 -07:00
Matthew Maurer
062709c3b3 cargo2android: Support exported C headers
staticlib and cdylib crate types generally want to export header files
for use by C code. Allow the location of these headers to be provided to
c2a for inclusion in blueprint.

Bug: 178565008
Test: Generate rustc-demangle-capi
Change-Id: I0aa9acfb081ea39a7e13315bfc8029d06b8f55d3
2021-08-17 15:06:34 -07:00
Matthew Maurer
9e4b781de9 cargo2android: Emit apex_available + min_sdk_version for native libs
Previously, we only emitted apex_available + min_sdk_version for 'lib'
type crates. That ignored:
* Explicit rlib
* Explicit dylib
* cdylib
* staticlib

Bug: 178565008
Test: Generated Android.bp for rustc-demangle-capi
Change-Id: I19f0abe385b9c13ac731b7f2c978052ffa6b92f7
2021-08-17 15:06:34 -07:00
Matthew Maurer
ac67725422 cargo2android: Add support for various image types
Test: Generated rustc-demangle's Android.bp with it
Bug: 178565008
Change-Id: I0877e2d7d9e309105610b4d87f2a6d45ef67903f
2021-08-17 15:06:34 -07:00
Joel Galenson
ccc0f99048 Merge "Deprecate the --dependencies argument." am: 610b6d8a37 am: e727611550
Original change: https://android-review.googlesource.com/c/platform/development/+/1798410

Change-Id: I6adf3bd9ca8c79e43d0a7e9232812384da9fac5a
2021-08-17 20:07:27 +00:00
Joel Galenson
e727611550 Merge "Deprecate the --dependencies argument." am: 610b6d8a37
Original change: https://android-review.googlesource.com/c/platform/development/+/1798410

Change-Id: I43be026fd1facf1e7a3c82b51639791aaa589d66
2021-08-17 19:45:08 +00:00
Joel Galenson
610b6d8a37 Merge "Deprecate the --dependencies argument." 2021-08-17 19:25:40 +00:00
Xin Li
1f28a72dd9 [automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: 4e9b8886c5 -s ours
am skip reason: Merged-In I815ef03c93bec8be2340dc340d840895f47ecafe with SHA-1 4bb39c56da is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15571673

Change-Id: I23c1f3d4936c1c7e16f5823f512894b591d90969
2021-08-17 18:35:41 +00:00
Xin Li
4e9b8886c5 Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master 2021-08-17 18:14:19 +00:00
Treehugger Robot
85501ae6e5 Merge "Add test to target_lib.py." am: f73c0f6138 am: 7a75be2c8b
Original change: https://android-review.googlesource.com/c/platform/development/+/1795808

Change-Id: I1358d1b24ed898cca973d5338df9cf157e8074b0
2021-08-17 17:53:28 +00:00
Joel Galenson
833848cea6 Deprecate the --dependencies argument.
We no longer use the --dependencies argument, but it is still used in
a number of places.  Let's remove its functionality but keep the
command-line option as a no-op so we can remove the uses over time.

Test: Run on crate that uses the option.
Change-Id: I954f68faf11d1a926f0ccf070afa8332385e3671
2021-08-17 10:50:42 -07:00
Treehugger Robot
7a75be2c8b Merge "Add test to target_lib.py." am: f73c0f6138
Original change: https://android-review.googlesource.com/c/platform/development/+/1795808

Change-Id: Icf82fa2068901a89d43daabaefd4091c757a7d06
2021-08-17 17:37:00 +00:00
Treehugger Robot
f73c0f6138 Merge "Add test to target_lib.py." 2021-08-17 17:22:40 +00:00
lishutong
54071681c8 Add test to target_lib.py.
Add test to two classes: BuildInfo and TargetLib. BuildInfo is a
dataclass which can store and parse Android Build informations from an
OTA package. TargetLib is a database interface which can be used to
store and extract BuildInfo.

Please refer to this CL for more details of these two classes:
https://android-review.googlesource.com/c/platform/development/+/1735315

Test: python test_target_lib.py -v
Change-Id: I3b2143af7f3708207b6c53744d903d3dcee92d55
2021-08-17 15:31:28 +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
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
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
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
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
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
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
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
Pirama Arumuga Nainar
6f7885e592 [scripts] Adjust FindClangDir am: a26dc346dd am: fb3953027f
Original change: https://android-review.googlesource.com/c/platform/development/+/1788867

Change-Id: Iadcbb2eb57e17c04dcafe5619956893376692216
2021-08-11 07:26:44 +00:00