Colin Cross
adaccfd2d4
[automerger skipped] Merge "Convert DumpViewer to Android.bp" into stage-aosp-master am: bdb19b328b -s ours
...
am skip reason: Merged-In I0f2fe63a3742888978cebd5bb9947d37291c5545 with SHA-1 bf2928fdc9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15799508
Change-Id: I9e2a41dc91cb8d438256b7545bda13f30c5363b7
2021-09-13 21:14:29 +00:00
Colin Cross
bdb19b328b
Merge "Convert DumpViewer to Android.bp" into stage-aosp-master
2021-09-13 21:10:02 +00:00
Christopher Ferris
8ca337986b
Merge "Modify the library fix up code." am: 6cfcae6cb3 am: 6b1027ca9b
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1824372
Change-Id: I1609b0998d42c2bd73a71adc61e07bbf919c5316
2021-09-11 00:50:47 +00:00
Christopher Ferris
6b1027ca9b
Merge "Modify the library fix up code." am: 6cfcae6cb3
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1824372
Change-Id: Id2d4741523691a5ccf396b5e4303fdfec8b9341e
2021-09-11 00:33:51 +00:00
Christopher Ferris
6cfcae6cb3
Merge "Modify the library fix up code."
2021-09-11 00:22:13 +00:00
Christopher Ferris
1f2051de9a
Modify the library fix up code.
...
Modify the library lookup code to try and find the various places
that a library might really exist in the symbols directory. This
is for atest which can run executables in different locations
than the actual where the symbolized file exists.
Test: Ran using /data/local/tmp, /data/local/tests,
Test: /data/local/tests/vendor, /data/local/tests/unrestricted and
Test: verified the correct library was found.
Test: Used tombstones crash data and verified all libraries
Test: still found properly.
Test: Ran atest CtsBionicTestCases and verified the symbolized
Test: binary could be found using a real tombstone crash.
Test: Did the same as above, but changed the path in the tombstone
Test: crash data from /data/local/tmp to /data/local/tests and
Test: /data/local/tests/unrestricted.
Change-Id: Iaa121823ef6142eaf9f7de3232b147bd7389bea5
2021-09-10 15:28:51 -07:00
Aurimas Liutikas
593ad2a776
Convert DumpViewer to Android.bp
...
Test: make DumpViewer
Change-Id: I0f2fe63a3742888978cebd5bb9947d37291c5545
Merged-In: I0f2fe63a3742888978cebd5bb9947d37291c5545
(cherry picked from commit 57eeb31650 )
2021-09-09 14:40:24 -07:00
Colin Cross
f0ccbc00e3
Merge "Convert DumpViewer to Android.bp" into sc-dev-plus-aosp
2021-09-09 21:22:22 +00:00
Jason Macnak
4706d98b53
Merge "Suffix libash with _rust to avoid name conflict" am: 7b3f02465b am: fc70e26304
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1819312
Change-Id: I4c6223e02deef5b8eea8185df7d216f0f7d4318d
2021-09-08 17:16:43 +00:00
Jason Macnak
fc70e26304
Merge "Suffix libash with _rust to avoid name conflict" am: 7b3f02465b
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1819312
Change-Id: I33efcfba8eeebb0d2c148f6fe0b2cb118eab82f7
2021-09-08 17:00:20 +00:00
Jason Macnak
7b3f02465b
Merge "Suffix libash with _rust to avoid name conflict"
2021-09-08 16:43:34 +00:00
Lukács T. Berki
370b9c7416
Merge "Update the way one generates the Bazel workspace." am: a96722e794 am: 73869d8585
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1818333
Change-Id: I474d81c59666793d3389c22fe9301a32f27af472
2021-09-07 06:32:13 +00:00
Lukács T. Berki
73869d8585
Merge "Update the way one generates the Bazel workspace." am: a96722e794
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1818333
Change-Id: I162c890b6a42a43456e60f4f1413d4ab73688cb4
2021-09-07 06:17:22 +00:00
Lukács T. Berki
a96722e794
Merge "Update the way one generates the Bazel workspace."
2021-09-07 06:08:07 +00:00
Lukacs T. Berki
9206f1c08b
Update the way one generates the Bazel workspace.
...
Test: Presubmits.
Change-Id: I0edfe61e78d04fcb468c68136ba1da3ee6e3fd1c
2021-09-06 11:36:59 +02:00
Jason Macnak
051340de9e
Suffix libash with _rust to avoid name conflict
...
Bug: b/189133061
Test: presubmit with attached topic
Change-Id: I6619857a7f632fe7ab0576dd0dd0fe4dacf677b1
2021-09-04 11:04:26 -07:00
Isaac Chen
07f00284ed
Merge "Create an arm64 kernel module to test arm64 KMI" am: f1f176fa45 am: 9f9be21a51
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1816780
Change-Id: I8f0a40eb478017bdecb47d4fb952cfbb624e2025
2021-09-03 07:06:52 +00:00
Isaac Chen
9f9be21a51
Merge "Create an arm64 kernel module to test arm64 KMI" am: f1f176fa45
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1816780
Change-Id: Ic1dadb1c17c9c59f139357ceccc7f7c728ae1021
2021-09-03 06:53:44 +00:00
Isaac Chen
f1f176fa45
Merge "Create an arm64 kernel module to test arm64 KMI"
2021-09-03 06:40:40 +00:00
Isaac Chen
bc82a1de7e
Create an arm64 kernel module to test arm64 KMI
...
This kernel module uses all the kernel symbols supported by arm64 GKI
build 7618735, the first arm64 GKI release (respin 5) for Android 12.
Bug: 196933449
Test: Load kmi_sym.ko on arm64 GKI on GF successfully. See README for details.
Change-Id: Idf4c9f5dcac128faf4d08bf9cdec780d0dd54ed8
2021-09-03 12:15:01 +08:00
Joel Galenson
0f4925b037
Merge "Generate cargo_pkg_version and cargo_env_compat for defaults." am: 1eda0d9208 am: a7cb52801f
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1815080
Change-Id: Ie17eb50e619550ba8997c7e8a184ac7fcf2c736f
2021-09-01 15:58:47 +00:00
Joel Galenson
a7cb52801f
Merge "Generate cargo_pkg_version and cargo_env_compat for defaults." am: 1eda0d9208
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1815080
Change-Id: Ie91b0f781994feacaa928fc9e287ddc9393eb1f9
2021-09-01 15:43:42 +00:00
Joel Galenson
1eda0d9208
Merge "Generate cargo_pkg_version and cargo_env_compat for defaults."
2021-09-01 15:28:02 +00:00
Kelvin Zhang
a30572e3a4
Merge changes Ic5fdefe2,I32cbd027,I464d846c,Ie9ef8e2b,Ib7b02d5c am: e6ae7c629b am: 8834603a01
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1815621
Change-Id: Ifa73b12a346a8640c29a5891e6634f6d3085225d
2021-09-01 14:49:34 +00:00
Kelvin Zhang
8a287efeea
Merge "Cancel polling task after component unmount" am: 3862d22d0e am: b1da09b852
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1815616
Change-Id: If420d4df57710175c396ccaed8495d5a815a95b1
2021-09-01 14:49:28 +00:00
Kelvin Zhang
5a581bdeb3
Merge "Remove noop try catch statements" am: 401c6d5d23 am: 5e1f196247
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1815095
Change-Id: Ia400ac7117bef190aef6538a01666142c5157b67
2021-09-01 14:49:22 +00:00
Kelvin Zhang
8834603a01
Merge changes Ic5fdefe2,I32cbd027,I464d846c,Ie9ef8e2b,Ib7b02d5c am: e6ae7c629b
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1815621
Change-Id: I18cc97ec071980725514785aafdd7927821410b8
2021-09-01 14:34:23 +00:00
Kelvin Zhang
b1da09b852
Merge "Cancel polling task after component unmount" am: 3862d22d0e
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1815616
Change-Id: If897bc469c04123262e67807e05f74fdc5a50ac0
2021-09-01 14:34:12 +00:00
Kelvin Zhang
5e1f196247
Merge "Remove noop try catch statements" am: 401c6d5d23
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1815095
Change-Id: I6c5c988fb833d75cf03359267db6bbce049319fa
2021-09-01 14:34:06 +00:00
Kelvin Zhang
e6ae7c629b
Merge changes Ic5fdefe2,I32cbd027,I464d846c,Ie9ef8e2b,Ib7b02d5c
...
* changes:
API Service should return json data directly
Rename path to db_path
Ignore vscode files in docker
Return error in json
Delegate choice of output file path to 1 place in code
2021-09-01 14:21:26 +00:00
Kelvin Zhang
3862d22d0e
Merge "Cancel polling task after component unmount"
2021-09-01 14:21:09 +00:00
Kelvin Zhang
401c6d5d23
Merge "Remove noop try catch statements"
2021-09-01 14:20:57 +00:00
Anton Hansson
0df6fdedce
[automerger skipped] Merge "Add sdk extension version info to prop templates" am: cf4b9a604d -s ours am: 7c0923a2be -s ours
...
am skip reason: Merged-In Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc with SHA-1 48c492ed9f is already in history
Original change: https://android-review.googlesource.com/c/platform/development/+/1810658
Change-Id: I98bed3db29380c7b34cd0aa106f85be1f181af2e
2021-09-01 09:32:12 +00:00
Anton Hansson
7c0923a2be
[automerger skipped] Merge "Add sdk extension version info to prop templates" am: cf4b9a604d -s ours
...
am skip reason: Merged-In Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc with SHA-1 48c492ed9f is already in history
Original change: https://android-review.googlesource.com/c/platform/development/+/1810658
Change-Id: I67e0c653f2ae5bfc8f37345461b497ea8e0ec163
2021-09-01 09:19:54 +00:00
Anton Hansson
cf4b9a604d
Merge "Add sdk extension version info to prop templates"
2021-09-01 09:00:15 +00:00
Anton Hansson
295fc250b6
[automerger skipped] Merge "Add sdk extension version info to prop templates" into stage-aosp-master am: 674c51fa21 -s ours
...
am skip reason: Merged-In Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc with SHA-1 786bf26e3a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15727746
Change-Id: I13b4de40db92f05c29c571d6548815de96c1dfa7
2021-09-01 08:34:30 +00:00
Anton Hansson
674c51fa21
Merge "Add sdk extension version info to prop templates" into stage-aosp-master
2021-09-01 08:21:32 +00:00
Kelvin Zhang
6e0c8c6c37
API Service should return json data directly
...
Change-Id: Ic5fdefe23443733c3c7e0ae8f351c39117326794
2021-08-31 20:06:57 -07:00
Kelvin Zhang
0a3522a60e
Merge "Skip non-zip files when refreshing build library" am: 2d4909a1cb am: 985259187a
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1811897
Change-Id: Ifc18b666217aed1db904ec8e7b89b25ef8e01476
2021-09-01 00:50:31 +00:00
Kelvin Zhang
985259187a
Merge "Skip non-zip files when refreshing build library" am: 2d4909a1cb
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1811897
Change-Id: I376dbf4d7cf672a7d64419b6cfae634b5b66c91e
2021-09-01 00:37:19 +00:00
Kelvin Zhang
fd50cb8be1
Rename path to db_path
...
Change-Id: I32cbd02722a81b54f55df092bc762463df939a9d
2021-08-31 17:28:43 -07:00
Kelvin Zhang
d7ebc10c0d
Cancel polling task after component unmount
...
Test: th
Change-Id: I0d9058bd24236ea1e22bf91f98b2dbadc83cf8d3
2021-08-31 17:28:42 -07:00
Kelvin Zhang
694daa581f
Remove noop try catch statements
...
Test: th
Change-Id: I5c6fcd5cdd602207e3befc3ff92137d39968c546
2021-08-31 17:28:42 -07:00
Kelvin Zhang
fd33874a47
Ignore vscode files in docker
...
Change-Id: I464d846c86a6c98c4be2e1993014a799ffc5d7b1
2021-08-31 17:28:42 -07:00
Kelvin Zhang
9b854aa4bf
Return error in json
...
Test: th
Change-Id: Ie9ef8e2bac6447bdc1bf40dcb2b5731b57b47f77
2021-08-31 17:28:42 -07:00
Kelvin Zhang
2ea0bfceb0
Delegate choice of output file path to 1 place in code
...
Test: th
Change-Id: Ib7b02d5ce4335594b6ca625d850e7176dbdb4f8e
2021-08-31 17:28:42 -07:00
Kelvin Zhang
2d4909a1cb
Merge "Skip non-zip files when refreshing build library"
2021-09-01 00:23:38 +00:00
Joel Galenson
b06c42a03c
Generate cargo_pkg_version and cargo_env_compat for defaults.
...
The existing code only adds it to things without defaults. This adds
it to the defaults module itself, which should not overlap the
existing code.
Test: Run and see new entries.
Change-Id: Iaf3d0b47193bb1f54cdc605c88c2cd68034d963a
2021-08-31 14:28:48 -07:00
Anton Hansson
48c492ed9f
Add sdk extension version info to prop templates
...
This adds two new properties alongside AndroidVersion.ApiLevel:
- AndroidVersion.ExtensionLevel: The sdk extension version if the SDK
- AndroidVersion.IsBaseSdk: Whether the extension level is the the one
that the ApiLevel shipped with (true), or if is an extension SDK
release (false).
While we're here, dedupe the recipe that processes these templates.
Bug: 195281582
Test: m out/host/linux-x86/development/sdk/platform_source.properties
and inspect the substitution is working
Change-Id: Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc
Merged-In: Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc
(cherry picked from commit cf2f42c36b7997e9ce87682bb3a5511bdb72936f)
2021-08-31 17:42:12 +00:00
Anton Hansson
538c18b677
Merge "Add sdk extension version info to prop templates" into sc-dev-plus-aosp
2021-08-31 10:15:34 +00:00