Jingwen Chen
3b1dcf4f46
Append APEX version instead of build ID for APK-in-APEX paths.
...
This CL removes the build_id.mk suffix and replaces it with a hardcoded
placeholder string that will be replaced with the actual version in
apex_manifest.json by apexer at apex construction time.
This means that as long as the apex version is incremented, the
APK-in-APEX will be installed to a new directory path from the package
manager's perspective.
Fixes: 229574810
Bug: 229625490
Bug: 226559955
Bug: 224589412
Bug: 227417611
Bug: 228157333
Bug: 228803590
Bug: 229136249
Test: atest StrictJavaPackagesTest
Test: soong tests
Test: deapexer list out/dist/com.google.android.permission.apex
Ignore-AOSP-First: this is an cherrypick
Change-Id: I9cef1418c3fc7e0970d96995b8398f5e82f479e0
Merged-In: I9cef1418c3fc7e0970d96995b8398f5e82f479e0
2022-04-26 12:54:50 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
562477b1c7
Merge changes from topic "b/215723302" am: 66e6466e0f
am: 4ed4ace5d9
am: 3f8e0c4846
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2002753
Change-Id: I77a2f325a37001ef47e83687242e1642bc6a3fd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 15:33:23 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
90bdb0b46a
Abstract prebuilt_etc into prebuilt_file am: b81f77ed24
am: c0fa5fb34e
am: 30136e83d5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2002752
Change-Id: Ic7909cc9aa5d32c1eb4f9fb4e28b86885ce442df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 15:33:19 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
7f55284a9e
DoNotConvert tzdata nor tz_version am: bff2e88a85
am: 9ea047d5e3
am: bf99c62ff5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2069572
Change-Id: I4e40f401a5f35e346ec45ed0093ec2f7aa1f349e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 15:33:16 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
3f8e0c4846
Merge changes from topic "b/215723302" am: 66e6466e0f
am: 4ed4ace5d9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2002753
Change-Id: I065c9ddbc5b27d2b5ed1fae998a776153de096f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 15:12:13 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
30136e83d5
Abstract prebuilt_etc into prebuilt_file am: b81f77ed24
am: c0fa5fb34e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2002752
Change-Id: Ie579a368a2b51f802250bce13cf3447e73b9eaf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 15:12:09 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
bf99c62ff5
DoNotConvert tzdata nor tz_version am: bff2e88a85
am: 9ea047d5e3
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2069572
Change-Id: I7ec3dcae1f326750945b87e74df6718e0defa23f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 15:12:06 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
4ed4ace5d9
Merge changes from topic "b/215723302" am: 66e6466e0f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2002753
Change-Id: I3a2b3d7c2830f82bc578624b3a434058c956eaf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 14:55:30 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
c0fa5fb34e
Abstract prebuilt_etc into prebuilt_file am: b81f77ed24
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2002752
Change-Id: Ica34b683a4696e86feabe0a6fd7f0fd0561d906f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 14:55:26 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
9ea047d5e3
DoNotConvert tzdata nor tz_version am: bff2e88a85
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2069572
Change-Id: Ib46e17f36142a262e20463509926a00b32cc89b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 14:55:23 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
66e6466e0f
Merge changes from topic "b/215723302"
...
* changes:
Use prebuilt_file for prebuilt_{etc,usr_share}
Abstract prebuilt_etc into prebuilt_file
2022-04-21 14:37:46 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
bff2e88a85
DoNotConvert tzdata nor tz_version
...
In using prebuilt_file for prebuilt_{etc,usr_share}, Bazel now sees such
targets translated and doesn't permit a target name to alias e.g. its
`src`. Thus we temporarily disable the conversion of the `tz_version` and
`tzdata` whilst their in-tree sources are updated. Their conversions
will be reenabled afterward.
Bug: 215723302
Test: bp2build.sh
Test: mixed_{libc,droid}.sh
Change-Id: Ie19813ccb0fb93c90b54bfd19c909ed15b826385
2022-04-21 14:37:12 +00:00
Jingwen Chen
7aa14bf929
[automerger skipped] Merge "Suffix the build ID to the dirname of APK-in-APEX files." am: 3a5be76dc0
am: 423fb97541
am: 22090e09fc
-s ours
...
am skip reason: Merged-In I8af49d51ff99cf8184d0e4d1136fff1cdb29c23e with SHA-1 11cca671ac
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2044863
Change-Id: If75731bbc507f58ca74f34c9938730a2a7b2952d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 10:37:25 +00:00
Jingwen Chen
22090e09fc
Merge "Suffix the build ID to the dirname of APK-in-APEX files." am: 3a5be76dc0
am: 423fb97541
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2044863
Change-Id: If9832aeffe026d395486d1d5743baf657d2c4908
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 10:14:19 +00:00
Jingwen Chen
423fb97541
Merge "Suffix the build ID to the dirname of APK-in-APEX files." am: 3a5be76dc0
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2044863
Change-Id: Ic42c6028c0612e77262fd7a1b48f75f9e92e184e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 09:48:45 +00:00
Jingwen Chen
3a5be76dc0
Merge "Suffix the build ID to the dirname of APK-in-APEX files."
2022-04-21 09:24:22 +00:00
Treehugger Robot
724b274d57
Merge "Recursively list Android image contents." am: fa8fce5542
am: 9b6a0a2bdd
am: d103706b0f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2049928
Change-Id: Ic969934a49168bcda268464fedf4ad652894053c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 07:22:17 +00:00
Treehugger Robot
d103706b0f
Merge "Recursively list Android image contents." am: fa8fce5542
am: 9b6a0a2bdd
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2049928
Change-Id: Iab8e382362bcfeee1f4af356863f5bfa59d748f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 06:58:58 +00:00
Treehugger Robot
9b6a0a2bdd
Merge "Recursively list Android image contents." am: fa8fce5542
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2049928
Change-Id: I4893802128de3e1238ec9b46ce83fe30c2bf4d9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 06:40:19 +00:00
Treehugger Robot
fa8fce5542
Merge "Recursively list Android image contents."
2022-04-21 06:25:10 +00:00
Wei Li
4ade3f0ffb
Merge "Put provenance_metadata.textproto in dist directory." am: 7023c80e19
am: 003edb878a
am: 8a6bdf408a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2069478
Change-Id: I5b7e5841663d200b17ea20238b436db7ed9992b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 05:13:31 +00:00
Wei Li
8a6bdf408a
Merge "Put provenance_metadata.textproto in dist directory." am: 7023c80e19
am: 003edb878a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2069478
Change-Id: If26ecbff446b48e89c40dcaf5b509a164e9065eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 04:59:17 +00:00
Wei Li
003edb878a
Merge "Put provenance_metadata.textproto in dist directory." am: 7023c80e19
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2069478
Change-Id: Id5a6521b0e2fd27863ac5086b583208f243e8624
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 04:41:07 +00:00
Wei Li
7023c80e19
Merge "Put provenance_metadata.textproto in dist directory."
2022-04-21 04:04:41 +00:00
TreeHugger Robot
8b37609b71
Merge "Remove duplicate optional libs" into tm-dev
2022-04-21 03:27:11 +00:00
Sasha Smundak
fe11851029
Recursively list Android image contents.
...
Relies on debugfs utility to inspect image contents.
The output looks something like this:
```
./
./app/
./app/Calendar/
./app/Calendar/Calendar.apk
```
Test: manual
Change-Id: Ia05f4e857dfd28ac76ac2b450b08f5cf5577d21f
2022-04-20 20:02:11 -07:00
Wei Li
7cf80a65a8
Put provenance_metadata.textproto in dist directory.
...
Bug: 217434690
Test: m dist
Change-Id: I2f0d51846b3aad48c923c2f281ed42b6d4fe2a1d
2022-04-21 00:02:09 +00:00
Dan Albert
4451946baa
Merge changes from topic "abigail-werror" am: e31a071389
am: 30cfbf22eb
am: d0399047c0
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2065275
Change-Id: Id24a2c0c0c4d09fe1c9421a71ba421d73ec1a350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 20:36:37 +00:00
Dan Albert
8d87262fa7
Abort on abitidy errors. am: 604086f988
am: 73de4dbcc1
am: e5cae493fe
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1737315
Change-Id: Ifeedb058a2b1cec90b2e49289b9b051ba25d4793
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 20:36:34 +00:00
Rahul Sabnis
3f23b77002
Merge "Updates test_config_fixer to also work for SuiteApkInstaller" into tm-dev
2022-04-20 20:29:49 +00:00
Dan Albert
d0399047c0
Merge changes from topic "abigail-werror" am: e31a071389
am: 30cfbf22eb
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2065275
Change-Id: I13c2a114ff2cb8ca15b1a3c72f5f847b8cd06e89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 20:19:19 +00:00
Dan Albert
e5cae493fe
Abort on abitidy errors. am: 604086f988
am: 73de4dbcc1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1737315
Change-Id: Ifa231041d984df6374d84b65d89f5731fda72feb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 20:19:17 +00:00
Dan Albert
30cfbf22eb
Merge changes from topic "abigail-werror" am: e31a071389
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2065275
Change-Id: I2ad507fb59e2443ba99fc671af35e1e4d2f3e399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 19:53:15 +00:00
Dan Albert
73de4dbcc1
Abort on abitidy errors. am: 604086f988
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1737315
Change-Id: I1833517f786194dd61a2211254f4515bdbc04871
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 19:53:13 +00:00
Treehugger Robot
ed2a5918b0
Merge "Install .rc files for ramdisk variants" am: 0c9d27c463
am: 0ad2da70c1
am: 9cb758c5c6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2062874
Change-Id: Ib093513ffe443d8a82a007e4c2c7d86ef7a4f81f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 19:32:36 +00:00
Dan Albert
e31a071389
Merge changes from topic "abigail-werror"
...
* changes:
Disable ABI dumping for hwasan builds.
Abort on abitidy errors.
2022-04-20 19:19:07 +00:00
Treehugger Robot
9cb758c5c6
Merge "Install .rc files for ramdisk variants" am: 0c9d27c463
am: 0ad2da70c1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2062874
Change-Id: I128e2b2c64f8f6c248524c33f9ffbb5e88161c62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 18:56:36 +00:00
Treehugger Robot
0ad2da70c1
Merge "Install .rc files for ramdisk variants" am: 0c9d27c463
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2062874
Change-Id: I73dc1a0fdc9f868215fe24072f8d513fb9b7de3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 18:32:23 +00:00
Treehugger Robot
0c9d27c463
Merge "Install .rc files for ramdisk variants"
2022-04-20 18:07:18 +00:00
Rahul Sabnis
ee1c1998d3
Updates test_config_fixer to also work for SuiteApkInstaller
...
Bug: 228385580
Test: atest BluetoothInstrumentationTests
Change-Id: I878309354c4aa5a492fb3d2bcecf8b1410e011ee
2022-04-20 10:23:02 -07:00
Alan Viverette
445a789d33
Remove duplicate optional libs
...
Fixes: 219958699
Test: ./update_prebuilts.py -x ########
Change-Id: I2ff0aff78379da84db5711e5d5a47b1253936bce
Merged-In: I2ff0aff78379da84db5711e5d5a47b1253936bce
(cherry picked from commit 21d7add8cd
)
2022-04-20 15:46:03 +00:00
Trevor Radcliffe
4bee3b2e59
Merge "Fix tests for cc_prebuilt_library bp2build" am: 2e7c82ea0b
am: 5d9a85745b
am: 4065592b87
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2068107
Change-Id: If96ad4d13b62d422cbcc8a4bc47df168ba314634
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 15:42:47 +00:00
Trevor Radcliffe
4065592b87
Merge "Fix tests for cc_prebuilt_library bp2build" am: 2e7c82ea0b
am: 5d9a85745b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2068107
Change-Id: I4132dd4c42c32e25112f73311a1c2ca945a3fc30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 15:18:19 +00:00
Trevor Radcliffe
5d9a85745b
Merge "Fix tests for cc_prebuilt_library bp2build" am: 2e7c82ea0b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2068107
Change-Id: Ifddb1c78328b50ebb0b45b2dd81041a8f22b9c59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 14:40:14 +00:00
Trevor Radcliffe
2e7c82ea0b
Merge "Fix tests for cc_prebuilt_library bp2build"
2022-04-20 14:16:44 +00:00
Treehugger Robot
1ddd007b90
Merge "Remove former roboleaf team members, add new" am: cdbc8a24e6
am: 1789cc41e6
am: 8e6112a4b1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2060597
Change-Id: I34245fa82ce2060c0f53f73770dd3c42608fa102
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 13:28:12 +00:00
Treehugger Robot
8e6112a4b1
Merge "Remove former roboleaf team members, add new" am: cdbc8a24e6
am: 1789cc41e6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2060597
Change-Id: I8c6de5b3cba4d8f32a28848f0a0102e92fc19c78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 13:01:17 +00:00
Treehugger Robot
1789cc41e6
Merge "Remove former roboleaf team members, add new" am: cdbc8a24e6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2060597
Change-Id: Ieef43ec95f249d04f060848a240dd4f78e29d952
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 12:41:01 +00:00
Treehugger Robot
cdbc8a24e6
Merge "Remove former roboleaf team members, add new"
2022-04-20 12:08:32 +00:00
Wei Li
eda65dfdcb
Merge "Add provenance_metadata as dependency of droidcore so the provenance metadata will be built by default." am: c81924a75b
am: 462c366825
am: a7e413e707
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2067413
Change-Id: I17cefaf03b55cb5604b5ad10d1b60010806881f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 06:20:49 +00:00