Commit Graph

49358 Commits

Author SHA1 Message Date
Ian Zerny
9fef1137fa Merge "Add mapping id to source file information for R8 full-mode builds." am: a52cbd67a3 am: 587380225f am: 2a79ac7356
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878501

Change-Id: I969a79e9b947e855733c63e9697c6617d06ec92a
2022-01-11 08:10:18 +00:00
Ian Zerny
2a79ac7356 Merge "Add mapping id to source file information for R8 full-mode builds." am: a52cbd67a3 am: 587380225f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878501

Change-Id: I44538c8282d009e5893af5af1460f0261a020ef7
2022-01-11 07:51:46 +00:00
Ian Zerny
587380225f Merge "Add mapping id to source file information for R8 full-mode builds." am: a52cbd67a3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878501

Change-Id: I5564556961b4985ad7591ebd45d30248889c7efc
2022-01-11 07:37:58 +00:00
Treehugger Robot
f7e9e1f434 Merge changes I9ad66ea2,I4c95b77b am: 57271b9f45 am: a7c0107744 am: 16213c6bbe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1934955

Change-Id: I111e14b3df8c222e8c00b16add7ba37d3324b3c7
2022-01-11 07:36:23 +00:00
Ian Zerny
a52cbd67a3 Merge "Add mapping id to source file information for R8 full-mode builds." 2022-01-11 07:20:50 +00:00
Treehugger Robot
16213c6bbe Merge changes I9ad66ea2,I4c95b77b am: 57271b9f45 am: a7c0107744
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1934955

Change-Id: I46fa49c796cb2107df91bf7dad3878363e4e8274
2022-01-11 07:18:25 +00:00
Treehugger Robot
a7c0107744 Merge changes I9ad66ea2,I4c95b77b am: 57271b9f45
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1934955

Change-Id: Ia5c342a6bbf931be55dbe63d2609341f9d1a8da2
2022-01-11 06:57:18 +00:00
Treehugger Robot
57271b9f45 Merge changes I9ad66ea2,I4c95b77b
* changes:
  Make android_app.stem overridable
  Use 'stem' to override APK name
2022-01-11 06:38:25 +00:00
Treehugger Robot
b252266b8a Merge "Consolidate conversions of is-board-platform(2)" am: 35f94eba51 am: e42453740a am: 2f2ec9f018
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1941101

Change-Id: I4689c601028764e59756904cb29b7ca44700649a
2022-01-11 05:35:41 +00:00
Treehugger Robot
2f2ec9f018 Merge "Consolidate conversions of is-board-platform(2)" am: 35f94eba51 am: e42453740a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1941101

Change-Id: I1de90cc99db9f67188ce2eacd523bb77f57abde7
2022-01-11 05:08:06 +00:00
Keyi Gui
ef93fb88fa Merge "Update droidstubs to support putting action inputs/outputs into the module-graph.json." am: f4bf09feba am: 23b9e124ee am: 9deb64462b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940894

Change-Id: Ie3ded1577cc19bab2b0b4374a8f75f95691d8a78
2022-01-11 04:37:36 +00:00
Treehugger Robot
045e13f624 Merge "Convert math functions" am: 4cfd37e617 am: dafb404bd6 am: 47ae8c856a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940098

Change-Id: I1729dbabb4afa33bb44645b73c7649b567b5a2a0
2022-01-11 04:37:25 +00:00
Treehugger Robot
b37b719e8e Merge "Make include_top comments only apply to the next statement" am: 03a0679529 am: 4d8ab7d1cc am: 25a6caab22
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940099

Change-Id: I7d292d8d8c1222a2cbc802774cef1b2d352765e1
2022-01-11 04:36:38 +00:00
Treehugger Robot
e42453740a Merge "Consolidate conversions of is-board-platform(2)" am: 35f94eba51
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1941101

Change-Id: Ib3a8674845da194b5d30379880d72d19b8cf0175
2022-01-11 04:22:05 +00:00
Keyi Gui
9deb64462b Merge "Update droidstubs to support putting action inputs/outputs into the module-graph.json." am: f4bf09feba am: 23b9e124ee
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940894

Change-Id: Ib40b0f4729961992da5a471eb121493c407ad6c8
2022-01-11 04:14:23 +00:00
Treehugger Robot
47ae8c856a Merge "Convert math functions" am: 4cfd37e617 am: dafb404bd6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940098

Change-Id: I9879f7c09b60c6eaac702244e6a287560f7b4889
2022-01-11 04:14:12 +00:00
Treehugger Robot
25a6caab22 Merge "Make include_top comments only apply to the next statement" am: 03a0679529 am: 4d8ab7d1cc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940099

Change-Id: I9842281c5d72b3c4b0d6becd1bcaed19d28714e0
2022-01-11 04:13:55 +00:00
Jooyung Han
01d80d8b4b Make android_app.stem overridable
override_android_app can set "stem" property to set the APK name.

Bug: 193504286
Test: m (soong test)
Change-Id: I9ad66ea28bd1b030cb2c588d1f070d72e62ab1c7
2022-01-11 13:07:44 +09:00
Jooyung Han
29e2f6d2c4 Use 'stem' to override APK name
When android_app.stem is set, use it as the APK name like other module
types.

Bug: 193504286
Test: m (soong test)
Change-Id: I4c95b77be382cff3cfecaf6ce38f99aed9f3238f
2022-01-11 13:03:49 +09:00
Treehugger Robot
35f94eba51 Merge "Consolidate conversions of is-board-platform(2)" 2022-01-11 03:51:21 +00:00
Keyi Gui
23b9e124ee Merge "Update droidstubs to support putting action inputs/outputs into the module-graph.json." am: f4bf09feba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940894

Change-Id: I1bc52c298cf5cd6dc13198559c6358df9d2648cf
2022-01-11 03:43:05 +00:00
Treehugger Robot
dafb404bd6 Merge "Convert math functions" am: 4cfd37e617
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940098

Change-Id: I89bbd6e31523468d4f8bfb9bc847c59bb7434a52
2022-01-11 03:42:33 +00:00
Treehugger Robot
4d8ab7d1cc Merge "Make include_top comments only apply to the next statement" am: 03a0679529
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940099

Change-Id: Ife489d526319269520ebd3b9d93e3f079c4ed2b2
2022-01-11 03:42:03 +00:00
Keyi Gui
f4bf09feba Merge "Update droidstubs to support putting action inputs/outputs into the module-graph.json." 2022-01-11 03:33:01 +00:00
Treehugger Robot
4cfd37e617 Merge "Convert math functions" 2022-01-11 03:28:01 +00:00
Treehugger Robot
03a0679529 Merge "Make include_top comments only apply to the next statement" 2022-01-11 03:11:51 +00:00
Pirama Arumuga Nainar
351126907c Merge "Enable memory-mapped coverage instrumentation" am: 6609484961 am: 74eb07ae42 am: b80d71f553
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1729633

Change-Id: I8d5aba2025b896774e5a9277c6c6deeb413d7cc0
2022-01-10 23:30:27 +00:00
Pirama Arumuga Nainar
b80d71f553 Merge "Enable memory-mapped coverage instrumentation" am: 6609484961 am: 74eb07ae42
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1729633

Change-Id: Ia8939b6dcd869b118f0447546163e394ba37d007
2022-01-10 23:07:31 +00:00
Pirama Arumuga Nainar
74eb07ae42 Merge "Enable memory-mapped coverage instrumentation" am: 6609484961
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1729633

Change-Id: I26d495298c4273e8000e17f70ad6d3537a680b48
2022-01-10 22:54:34 +00:00
Pirama Arumuga Nainar
6609484961 Merge "Enable memory-mapped coverage instrumentation" 2022-01-10 22:36:57 +00:00
Sam Delmerico
0d9bf06f35 Merge "Convert javacflags -> javacopts for java_binary_host" am: 88a1b9da85 am: a3b597cacb am: e73c046d05
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940313

Change-Id: Ibab7a895dec1f6136501461bd5fac94f587a7d6d
2022-01-10 22:35:15 +00:00
Sam Delmerico
e73c046d05 Merge "Convert javacflags -> javacopts for java_binary_host" am: 88a1b9da85 am: a3b597cacb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940313

Change-Id: I22c6275a26226d9038c9f068167ea7f8b9a55518
2022-01-10 22:16:48 +00:00
Sam Delmerico
a3b597cacb Merge "Convert javacflags -> javacopts for java_binary_host" am: 88a1b9da85
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940313

Change-Id: I938ec7351032154c7a8d60e7f4d42fac6678a44e
2022-01-10 21:11:15 +00:00
Sam Delmerico
88a1b9da85 Merge "Convert javacflags -> javacopts for java_binary_host" 2022-01-10 20:53:39 +00:00
Keyi
fe310a9305 Update droidstubs to support putting action inputs/outputs into the module-graph.json.
Test: local test

Change-Id: I6ce657f2ad53c261bcbdd317c266cf179a0cc6e9
2022-01-10 21:28:37 +08:00
Inseob Kim
51c8d94d37 Merge "Revert^3 "Add seapp_contexts to allowlist of makefile goal"" am: 865d5e6c9d am: c24e740cd0 am: 865498319d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1934941

Change-Id: I6eb14ca05494ff8c972068615dfc35dc4e3a303f
2022-01-10 12:12:37 +00:00
Inseob Kim
865498319d Merge "Revert^3 "Add seapp_contexts to allowlist of makefile goal"" am: 865d5e6c9d am: c24e740cd0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1934941

Change-Id: Ib284a78d078d154fe7d0c021bbd62bbbc460e6a7
2022-01-10 11:51:12 +00:00
Inseob Kim
c24e740cd0 Merge "Revert^3 "Add seapp_contexts to allowlist of makefile goal"" am: 865d5e6c9d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1934941

Change-Id: I29055590f892e18792f9fbcbfe05abf162a80d73
2022-01-10 11:30:08 +00:00
Inseob Kim
865d5e6c9d Merge "Revert^3 "Add seapp_contexts to allowlist of makefile goal"" 2022-01-10 11:15:28 +00:00
Treehugger Robot
19d8dd9085 Merge "Use Module.GetProperties() instead of ModuleBase.generalProperties" am: 25656c401b am: 04c5dcf22a am: 4ed2e665d7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1937381

Change-Id: If51c2c3533b29ec22445bf9a147ff36916b010a2
2022-01-10 09:43:48 +00:00
Treehugger Robot
4ed2e665d7 Merge "Use Module.GetProperties() instead of ModuleBase.generalProperties" am: 25656c401b am: 04c5dcf22a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1937381

Change-Id: I6025b3eb0bee66604809185f892117018cd70ac3
2022-01-10 09:23:08 +00:00
Treehugger Robot
04c5dcf22a Merge "Use Module.GetProperties() instead of ModuleBase.generalProperties" am: 25656c401b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1937381

Change-Id: I446089054ac47c0d58048e82be1cc1032ac9d36c
2022-01-10 09:06:29 +00:00
Treehugger Robot
25656c401b Merge "Use Module.GetProperties() instead of ModuleBase.generalProperties" 2022-01-10 08:49:17 +00:00
Ian Zerny
fc7df6124f Add mapping id to source file information for R8 full-mode builds.
Bug: 204293621
Test: atest --host r8retrace-check-retraced-stacktrace
Change-Id: I09703cfaab72350efe67217be9e2d37988218f4d
2022-01-10 08:56:19 +01:00
Treehugger Robot
dd196cca96 Merge "Add sepolicy compat versions to soong config" am: bac9e97c50 am: 44e4c47c47 am: aff62cef5e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940897

Change-Id: I6586a86613be1e082c47836329c09eb3b8dabd1f
2022-01-10 03:03:24 +00:00
Treehugger Robot
aff62cef5e Merge "Add sepolicy compat versions to soong config" am: bac9e97c50 am: 44e4c47c47
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940897

Change-Id: I703899159e8697f57de160eebd10f9530b592981
2022-01-10 02:45:03 +00:00
Treehugger Robot
44e4c47c47 Merge "Add sepolicy compat versions to soong config" am: bac9e97c50
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940897

Change-Id: I9739ec8516ba5e1e727e3f8ee6fc1404b02b37ff
2022-01-10 02:30:04 +00:00
Treehugger Robot
bac9e97c50 Merge "Add sepolicy compat versions to soong config" 2022-01-10 02:09:23 +00:00
Treehugger Robot
7f06df8c6f Merge "Fix format" am: e508f6a50b am: c6d1139f66 am: fa67fade6f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940896

Change-Id: Ie1a777ef06bd0ed40ff8f1fc8b34dcbc771f016d
2022-01-08 03:15:10 +00:00
Usta
851a3271ce Use Module.GetProperties() instead of ModuleBase.generalProperties
ModuleBase.generalProperties served the pupose of being a subset
of ModuleBase.customizableProperties. But now with the removal of
the latter, the former is simply a redirection to Module.GetProperties()

Bug: 206961391
Test: m nothing and diff the ninja files
Change-Id: I6dd8b7ba74eb5e7ffb61029b0f9129eec2ccfdaf
2022-01-08 03:09:52 +00:00