Commit Graph

73266 Commits

Author SHA1 Message Date
Romain Jobredeaux
373a2eeef6 Merge "Support target and max sdk version in app bp2build." into main am: aa634fdbdb am: 5484ae074f am: 4e4274f597 am: 9dd8dc623f am: 47af21b8bd am: a76542f3ce
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2650657

Change-Id: Ibafdbc461d5c172a2a32766d08808b3d1f637fcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 17:49:10 +00:00
Romain Jobredeaux
a76542f3ce Merge "Support target and max sdk version in app bp2build." into main am: aa634fdbdb am: 5484ae074f am: 4e4274f597 am: 9dd8dc623f am: 47af21b8bd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2650657

Change-Id: I3560c2c3191ad79c1d65dfec949c3f540aa49414
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 17:05:16 +00:00
Romain Jobredeaux
47af21b8bd Merge "Support target and max sdk version in app bp2build." into main am: aa634fdbdb am: 5484ae074f am: 4e4274f597 am: 9dd8dc623f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2650657

Change-Id: I23aea14e4eb347bb86ff10be5abdf1ebed3b644e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 16:21:27 +00:00
Romain Jobredeaux
9dd8dc623f Merge "Support target and max sdk version in app bp2build." into main am: aa634fdbdb am: 5484ae074f am: 4e4274f597
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2650657

Change-Id: I258afa5d37dca61a17efc7c66058e0b184f9b90d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 15:35:25 +00:00
Romain Jobredeaux
4e4274f597 Merge "Support target and max sdk version in app bp2build." into main am: aa634fdbdb am: 5484ae074f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2650657

Change-Id: I63c3932ecc810654cf764171ded6a1506c06fd04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 14:55:30 +00:00
Romain Jobredeaux
5484ae074f Merge "Support target and max sdk version in app bp2build." into main am: aa634fdbdb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2650657

Change-Id: Ia09f51d07aad7c1b22d58b79376ab616f9cf8dd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 14:13:19 +00:00
Romain Jobredeaux
aa634fdbdb Merge "Support target and max sdk version in app bp2build." into main 2023-07-11 13:34:29 +00:00
Aditya Kumar
f33c56b8a5 Merge "gsimple-template-names" into main am: 9488eb82d4 am: 682eb3468e am: e52b326e93 am: df85ea75d4 am: 3c22bcefa8 am: 12eb83a23a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2607728

Change-Id: I9d8b54c5dc38e00e2af528cc43d11b8106f97ed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 10:15:50 +00:00
Aditya Kumar
12eb83a23a Merge "gsimple-template-names" into main am: 9488eb82d4 am: 682eb3468e am: e52b326e93 am: df85ea75d4 am: 3c22bcefa8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2607728

Change-Id: I60468304aae36eac3a4cf132ce7646748dd6cbd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 09:35:32 +00:00
Treehugger Robot
94c92f681a Merge "Copy imported APKs to output filename" into main am: 5af242249d am: 84d32c5b1c am: b4a858d7a0 am: 66baac045c am: 5dd8957f47 am: c873cb2da7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652823

Change-Id: I51ab8c69b6ad17bad51ccddd1c07201d64e223d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 09:12:16 +00:00
Aditya Kumar
3c22bcefa8 Merge "gsimple-template-names" into main am: 9488eb82d4 am: 682eb3468e am: e52b326e93 am: df85ea75d4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2607728

Change-Id: Iff4979292f7a53fa4441281753c124caca97f4c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 08:55:38 +00:00
Treehugger Robot
c873cb2da7 Merge "Copy imported APKs to output filename" into main am: 5af242249d am: 84d32c5b1c am: b4a858d7a0 am: 66baac045c am: 5dd8957f47
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652823

Change-Id: Ia984e20214f50c85031f6fa76b3f55d5faa40fa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 08:29:46 +00:00
Aditya Kumar
df85ea75d4 Merge "gsimple-template-names" into main am: 9488eb82d4 am: 682eb3468e am: e52b326e93
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2607728

Change-Id: I1e2c8565c1f74f82abf69949c46dc9cfc2d66818
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 08:13:51 +00:00
Treehugger Robot
5dd8957f47 Merge "Copy imported APKs to output filename" into main am: 5af242249d am: 84d32c5b1c am: b4a858d7a0 am: 66baac045c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652823

Change-Id: Ie09da003b18e26617b7338567d39837d23525b66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 07:54:19 +00:00
Aditya Kumar
e52b326e93 Merge "gsimple-template-names" into main am: 9488eb82d4 am: 682eb3468e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2607728

Change-Id: I866314b03d6fbe2093c694ce3416513679a4da98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 07:11:30 +00:00
Treehugger Robot
66baac045c Merge "Copy imported APKs to output filename" into main am: 5af242249d am: 84d32c5b1c am: b4a858d7a0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652823

Change-Id: Ie831e50670911dcd3b774871c1cee5d7f3efc3dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 06:49:03 +00:00
Aditya Kumar
682eb3468e Merge "gsimple-template-names" into main am: 9488eb82d4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2607728

Change-Id: I4a504cd5fed09f7d7e3d3aa5f15f51adb9c8822b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 06:29:01 +00:00
Treehugger Robot
b4a858d7a0 Merge "Copy imported APKs to output filename" into main am: 5af242249d am: 84d32c5b1c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652823

Change-Id: I4d1d9f10003b565b70f6023d28c747f45cef129d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 06:06:24 +00:00
Aditya Kumar
9488eb82d4 Merge "gsimple-template-names" into main 2023-07-11 05:54:11 +00:00
Treehugger Robot
84d32c5b1c Merge "Copy imported APKs to output filename" into main am: 5af242249d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652823

Change-Id: I087856e45b24e9a0fadceecca1c0dcb13cb9ef81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 05:26:46 +00:00
Treehugger Robot
5af242249d Merge "Copy imported APKs to output filename" into main 2023-07-11 04:52:46 +00:00
Igor Foox
3019010026 Merge "Update genrule denylist to make m droid build." into main am: 921a465919 am: 1113811927 am: 727f6ce321 am: d42c460648 am: d86b2f9475 am: 72d23d8c3a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2651202

Change-Id: If17e62e5dec2cd1b26afbe5d5b5c83f3a7e9e878
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 02:54:52 +00:00
Igor Foox
72d23d8c3a Merge "Update genrule denylist to make m droid build." into main am: 921a465919 am: 1113811927 am: 727f6ce321 am: d42c460648 am: d86b2f9475
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2651202

Change-Id: I931ecf0b297c763d87380ba2273596b7c531a13e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 02:16:41 +00:00
Igor Foox
d86b2f9475 Merge "Update genrule denylist to make m droid build." into main am: 921a465919 am: 1113811927 am: 727f6ce321 am: d42c460648
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2651202

Change-Id: I63d30107574db7f853c8692dbf2ee412627a30cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 01:34:34 +00:00
Igor Foox
d42c460648 Merge "Update genrule denylist to make m droid build." into main am: 921a465919 am: 1113811927 am: 727f6ce321
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2651202

Change-Id: I48bdaf64268cf98f1b533b4bda07af0d34318772
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 00:50:20 +00:00
Igor Foox
727f6ce321 Merge "Update genrule denylist to make m droid build." into main am: 921a465919 am: 1113811927
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2651202

Change-Id: I08d84dab9ed7a76f7e0f100c6c17cbd283c058b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 00:10:45 +00:00
Igor Foox
1113811927 Merge "Update genrule denylist to make m droid build." into main am: 921a465919
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2651202

Change-Id: Ic15817a72cdebb304f115499171c74027e4c0573
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 23:28:55 +00:00
Igor Foox
921a465919 Merge "Update genrule denylist to make m droid build." into main 2023-07-10 22:51:44 +00:00
Colin Cross
5780d57a71 Copy imported APKs to output filename
android_app_import and android_test_import modules with processed: true
and skip_preprocessed_apk_checks are used directly from the source tree.
If the source file name doesn t match the module name and the file is
used as test data it can result in the wrong filename being used.  Copy
the source file to an output file with the correct name first.

Bug: 290376750
Test: m CtsAppSecurityHostTestCases
Change-Id: I4a6dd1c5e48db7085ea41035def31f0844948a46
2023-07-10 22:18:01 +00:00
Igor Foox
04ff5f90ae Update genrule denylist to make m droid build.
Test: lunch aosp_cf_x86_phone && GENRULE_SANDBOXING=true m droid
Change-Id: I9092df9a407ffe9a7f1c12f18fb0ce1c5fa027a1
2023-07-10 14:58:51 -04:00
Elliott Hughes
a1d5d18044 Merge "Remove -fstrict-aliasing from arm32." into main am: ff96fe1589 am: 4f31fc623d am: 1c20ecc192 am: 7daa03e9a3 am: 7fefc2aaba am: 2e193a144f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2646182

Change-Id: I4e273351712041ed312b334a46b9ded169faa5f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 18:44:59 +00:00
Elliott Hughes
2e193a144f Merge "Remove -fstrict-aliasing from arm32." into main am: ff96fe1589 am: 4f31fc623d am: 1c20ecc192 am: 7daa03e9a3 am: 7fefc2aaba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2646182

Change-Id: Iadf204fdb3a0f75aa5c7852ddde3c06b93f0551c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 18:06:04 +00:00
AdityaK
423e4ce9e3 gsimple-template-names
Based on: https://chromium-review.googlesource.com/c/chromium/src/+/3988987

```
Savings are almost 330M on 11G

du -s out.diff/target/product/vsoc_arm64/symbols
10751692        out.diff/target/product/vsoc_arm64/symbols
du -s out/target/product/vsoc_arm64/symbols
11086508        out/target/product/vsoc_arm64/symbols
```

Change-Id: I49a5c4cadc77cb0d97e680e95c4efa7156a42f13
2023-07-10 17:36:22 +00:00
Elliott Hughes
7fefc2aaba Merge "Remove -fstrict-aliasing from arm32." into main am: ff96fe1589 am: 4f31fc623d am: 1c20ecc192 am: 7daa03e9a3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2646182

Change-Id: If1dbdc574b589a1adf74451c6397e099575275f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 17:22:53 +00:00
Elliott Hughes
7daa03e9a3 Merge "Remove -fstrict-aliasing from arm32." into main am: ff96fe1589 am: 4f31fc623d am: 1c20ecc192
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2646182

Change-Id: I5a4e09bc37a6ab46f4cbd102005d962bbd5f3223
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 16:41:48 +00:00
Elliott Hughes
1c20ecc192 Merge "Remove -fstrict-aliasing from arm32." into main am: ff96fe1589 am: 4f31fc623d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2646182

Change-Id: I5c389ef26acfb26e37089f2d6ecf10ae627dfb6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 16:01:40 +00:00
Treehugger Robot
1fda270861 Merge "kzip build: pipe error message to stderr." into main am: ab8ed75b6b am: 6e57e9b38f am: 6a549eff20 am: ead44f6e31 am: 6e76ab9a96 am: 3499a6cd41
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2648202

Change-Id: I9a10394d464151d3992323c20a40de5155574570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 15:51:46 +00:00
Romain Jobredeaux
496660d38a Support target and max sdk version in app bp2build.
Test: Unit tests + CI
Bug: 285304294
Bug: 280465047
Change-Id: I9bb1b6f9729ad783a43837d77dcf2d02b50ca77e
2023-07-10 11:50:00 -04:00
Elliott Hughes
4f31fc623d Merge "Remove -fstrict-aliasing from arm32." into main am: ff96fe1589
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2646182

Change-Id: I6be82a82dbb7161d78ceb702eddececab01e245a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 15:20:10 +00:00
Treehugger Robot
3499a6cd41 Merge "kzip build: pipe error message to stderr." into main am: ab8ed75b6b am: 6e57e9b38f am: 6a549eff20 am: ead44f6e31 am: 6e76ab9a96
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2648202

Change-Id: Ic683890e64d17fa10210eaa83cab3b8a0f2b8628
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 15:18:02 +00:00
Elliott Hughes
ff96fe1589 Merge "Remove -fstrict-aliasing from arm32." into main 2023-07-10 14:37:39 +00:00
Treehugger Robot
6e76ab9a96 Merge "kzip build: pipe error message to stderr." into main am: ab8ed75b6b am: 6e57e9b38f am: 6a549eff20 am: ead44f6e31
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2648202

Change-Id: I5b4b9a431af298db7443603e730810f86b9833a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 14:35:51 +00:00
Treehugger Robot
ead44f6e31 Merge "kzip build: pipe error message to stderr." into main am: ab8ed75b6b am: 6e57e9b38f am: 6a549eff20
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2648202

Change-Id: I326b511468055f1cefec9534b4b239c4dbac2d3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 13:55:13 +00:00
Treehugger Robot
6a549eff20 Merge "kzip build: pipe error message to stderr." into main am: ab8ed75b6b am: 6e57e9b38f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2648202

Change-Id: I2da7e222571050dbe3b3d3eef69b54804f50ea20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 13:12:40 +00:00
Treehugger Robot
6e57e9b38f Merge "kzip build: pipe error message to stderr." into main am: ab8ed75b6b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2648202

Change-Id: I289fa5f946fcfb3134b49afa9a11255d93af1344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 12:31:30 +00:00
Treehugger Robot
ab8ed75b6b Merge "kzip build: pipe error message to stderr." into main 2023-07-10 11:45:09 +00:00
Jingwen Chen
ce08efd395 kzip build: pipe error message to stderr.
This was going to stdout so it wasn't showing up on build_error.log.

Test: n/a
Change-Id: I58ac08961b089d06720a307ece3398594b3456de
2023-07-10 08:18:58 +00:00
Treehugger Robot
5665622547 Merge "Implement OutputFileProducer for android_app_import and android_test_import" into main am: b2ace8d72d am: ed7ff79589 am: 58e3067618 am: 9d12e40dec am: 3fa8e286c3 am: 14fbf01979
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652340

Change-Id: I646dc735f7fcc19586fea43614105a57e26fcf94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 04:37:36 +00:00
Treehugger Robot
14fbf01979 Merge "Implement OutputFileProducer for android_app_import and android_test_import" into main am: b2ace8d72d am: ed7ff79589 am: 58e3067618 am: 9d12e40dec am: 3fa8e286c3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652340

Change-Id: I02c7f86a1d0d74b66aa536a8ae29aa6c5cbaf540
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 04:05:49 +00:00
Treehugger Robot
3fa8e286c3 Merge "Implement OutputFileProducer for android_app_import and android_test_import" into main am: b2ace8d72d am: ed7ff79589 am: 58e3067618 am: 9d12e40dec
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652340

Change-Id: I14f9984f534c5ae1913406b5470e829268bf9923
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 03:22:38 +00:00