Treehugger Robot
e124bd97d9
Merge "Iterate <uses-library> in deterministic order in manifest_fixer." am: bfb98ece49
am: da55e8208f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418533
Change-Id: Icd116d796253e1062d0cc28c985becf03bd30238
2020-09-04 01:35:10 +00:00
Treehugger Robot
da55e8208f
Merge "Iterate <uses-library> in deterministic order in manifest_fixer." am: bfb98ece49
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418533
Change-Id: I42df02457960f99d3257d131524d8005e2c7a97e
2020-09-04 01:17:25 +00:00
Treehugger Robot
bfb98ece49
Merge "Iterate <uses-library> in deterministic order in manifest_fixer."
2020-09-04 00:45:48 +00:00
Treehugger Robot
cc4fb483cb
Merge "Add imports_compile_dex to prebuilt_apis" am: cda9a92efb
am: 48e2acaf99
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418868
Change-Id: I87f5460a1351469bd3529890f57aca829861a11e
2020-09-04 00:27:39 +00:00
Treehugger Robot
48e2acaf99
Merge "Add imports_compile_dex to prebuilt_apis" am: cda9a92efb
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418868
Change-Id: I29a69d3fd58d9bd7d02ad27fc5b9b9b54b633f63
2020-09-04 00:05:40 +00:00
Treehugger Robot
cda9a92efb
Merge "Add imports_compile_dex to prebuilt_apis"
2020-09-03 23:50:17 +00:00
Bill Peckham
5e7d0a3fed
Merge "Add exclude_from_vendor_snapshot property, related logic" am: e1359af34d
am: f3bf78650a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1416430
Change-Id: I50a0f36737e1a507af90a63d5ede5dbeec3f73a4
2020-09-03 18:19:02 +00:00
Bill Peckham
f3bf78650a
Merge "Add exclude_from_vendor_snapshot property, related logic" am: e1359af34d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1416430
Change-Id: I89da13623f047a1651fb99b6a6ccc575cc75171c
2020-09-03 18:06:37 +00:00
Bill Peckham
e1359af34d
Merge "Add exclude_from_vendor_snapshot property, related logic"
2020-09-03 17:52:29 +00:00
Paul Duffin
86244d1d71
Remove unnecessary methods/fields of DefaultsModule/Base am: 3f98d148df
am: 891e77641d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418390
Change-Id: I592c561ed56f4cc79110472032df829b9f62c075
2020-09-03 16:12:33 +00:00
Paul Duffin
891e77641d
Remove unnecessary methods/fields of DefaultsModule/Base am: 3f98d148df
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418390
Change-Id: Ib44fe28b451daa19ef9b7fec83fc549924ba5024
2020-09-03 15:41:27 +00:00
Paul Duffin
addcd0e02a
Extract dist properties from commonProperties am: ed87513b0b
am: f2dc411692
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418389
Change-Id: I6fb3de84b7055a37bcaf216e4224a40678560acb
2020-09-03 15:33:33 +00:00
Paul Duffin
f2dc411692
Extract dist properties from commonProperties am: ed87513b0b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418389
Change-Id: I9a59d1a4154409a6a3d1efa590cccd2064b6c389
2020-09-03 15:18:46 +00:00
Ulya Trafimovich
d2c7ddc82a
Iterate <uses-library> in deterministic order in manifest_fixer.
...
Bug: 132357300
Test: lunch cf_x86_phone-userdebug && m
Change-Id: Ideb7e0f7beae8c80561f841b8ce9129003f1aa96
2020-09-03 15:52:01 +01:00
Paul Duffin
3f98d148df
Remove unnecessary methods/fields of DefaultsModule/Base
...
The commonProperties and defaultsVisibilityProperties fields are only
used as containers for default values for properties and only within
the InitDefaultsModule() and so can be removed and replaced with an
empty structure instead.
Test: m checkbuild and TH
Change-Id: Ic5038d6b84b33afdf4859ced08e59871b9cde4a2
2020-09-03 10:12:10 +01:00
Paul Duffin
ed87513b0b
Extract dist properties from commonProperties
...
Common properties are automatically inherited from a parent module
(i.e. one that calls CreateModule()) to the child module that it
creates. This makes no sense for dist/dists properties so this change
extracts them into their own structure separate to the
commonProperties.
Test: m checkbuild and TreeHugger
Bug: 160448975
Change-Id: Icceb20455e13394dd3b3bce464fb9bb34882d6c3
2020-09-03 10:12:10 +01:00
Yi Kong
d1eff8c1a6
Merge "Revert "Revert "[pgo] Return updated Flags after adding flags for PGO/AFDO""" am: 4f78c512d4
am: 7daf77bbc6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418988
Change-Id: I2b29b2c28cc4172ec5a33d26c20603972536c0f0
2020-09-03 08:54:53 +00:00
Yi Kong
7daf77bbc6
Merge "Revert "Revert "[pgo] Return updated Flags after adding flags for PGO/AFDO""" am: 4f78c512d4
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418988
Change-Id: I73355f33044be0378e395f06f2d3b52eeed08f59
2020-09-03 07:41:57 +00:00
Yi Kong
4f78c512d4
Merge "Revert "Revert "[pgo] Return updated Flags after adding flags for PGO/AFDO"""
2020-09-03 07:25:24 +00:00
Colin Cross
ee61f6b507
Merge "Revert "Create os and arch variants for GoBinaryTool modules"" am: 02789ab327
am: 6deda0a39a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1419428
Change-Id: Ib061198d2a2e3c09e3edcae9800f9808c1c48c01
2020-09-03 04:42:53 +00:00
Colin Cross
6deda0a39a
Merge "Revert "Create os and arch variants for GoBinaryTool modules"" am: 02789ab327
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1419428
Change-Id: I3d563ce07c76ae3d0200be599f7576d4253b3bcd
2020-09-03 04:31:55 +00:00
Colin Cross
02789ab327
Merge "Revert "Create os and arch variants for GoBinaryTool modules""
2020-09-03 03:46:26 +00:00
Colin Cross
d4bdabcfad
Revert "Create os and arch variants for GoBinaryTool modules"
...
This reverts commit 1ec1255476
.
Reason for revert: b/167632665, broke linux_bionic builds.
Change-Id: I544fb5fd8aab06efa5618f076af3032271d4020f
2020-09-03 03:45:42 +00:00
Treehugger Robot
83c6df9f58
Merge "AutoGen: Support NativeTest with vendor namespace." am: 52ddbe25f9
am: cab67c0dff
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1399147
Change-Id: I688b368a89172205596aeec075dab62438f49b1a
2020-09-03 03:29:25 +00:00
Treehugger Robot
cab67c0dff
Merge "AutoGen: Support NativeTest with vendor namespace." am: 52ddbe25f9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1399147
Change-Id: I1d18daede7426969383666263a2a3aef27a5bc37
2020-09-03 03:07:06 +00:00
Treehugger Robot
52ddbe25f9
Merge "AutoGen: Support NativeTest with vendor namespace."
2020-09-03 02:26:11 +00:00
Colin Cross
3fa94fc983
Merge changes I59b7a32a,Ida7bc75a am: 0329f2398c
am: 90d0500699
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1406259
Change-Id: Idb4028f1b5522080050802fa944276668ccea3a4
2020-09-03 00:53:20 +00:00
Colin Cross
90d0500699
Merge changes I59b7a32a,Ida7bc75a am: 0329f2398c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1406259
Change-Id: I9b2b709c59630394aa528c64b4fbe60b52d50be5
2020-09-03 00:21:49 +00:00
Colin Cross
0329f2398c
Merge changes I59b7a32a,Ida7bc75a
...
* changes:
Only request image and version variations for device SDK dependencies
Create os and arch variants for GoBinaryTool modules
2020-09-02 23:51:53 +00:00
Bill Peckham
945441c09a
Add exclude_from_vendor_snapshot property, related logic
...
When building a vendor snapshot, the general rule the
build system uses to select a module for inclusion into
the vendor snapshot is if it's a framework module.
However, there are cases where a partner may modify the
framework module, thereby assuming control of that
module.
This change adds the exclude_from_vendor_snapshot
property allowing the partner to mark a module that
would normally be included in the vendor snapshot for
exclusion. This module is then built from source when
building the vendor image against the vendor snapshot.
Bug: 165705527
Test: m nothing
Test: build partner code against vendor snapshot
Change-Id: I6c5c15f13eeeb8f29717a4abd84b65fa72096889
2020-09-02 22:27:45 +00:00
Xin Li
843467a779
[automerger skipped] Skip RP1A.200720.011 am: 5fc64a124a
-s ours
...
am skip reason: Change-Id Ib829749836c9683032ef97642b3ffa7a87bf47b9 with SHA-1 7abd275906
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12514384
Change-Id: Ic64df500509692f17605e1d36acb1397323fe8be
2020-09-02 19:17:01 +00:00
Xin Li
24b7fe082c
[automerger skipped] Mark RP1A.200720.001 as merged am: 03a3afda71
-s ours
...
am skip reason: Change-Id I6d013916d33618dab06447fbfd7ee0d9e2d09d7a with SHA-1 847ca7514e
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12514224
Change-Id: I7dee74c5ab32223a75b17fe0c6b90ddfe3ce155f
2020-09-02 19:15:22 +00:00
Xin Li
5fc64a124a
Skip RP1A.200720.011
...
Bug: 167588565
Merged-In: Ib829749836c9683032ef97642b3ffa7a87bf47b9
Change-Id: Ib144077325877e04ce4cf3287dad7b3f985a21f3
2020-09-02 12:01:25 -07:00
Xin Li
03a3afda71
Mark RP1A.200720.001 as merged
...
Bug: 167588565
Merged-In: I6d013916d33618dab06447fbfd7ee0d9e2d09d7a
Change-Id: Ib6257e70d91d5f22362fc91642a020b35899f9b3
2020-09-02 11:44:48 -07:00
Pirama Arumuga Nainar
fe1da75972
Revert "Revert "[pgo] Return updated Flags after adding flags for PGO/AFDO""
...
This reverts commit 988ff8d149
.
Reason for revert: RBE can now handle PGO profiles during remote linking.
Bug: http://b/162702246
Test: m ANDROID_PGO_INSTRUMENT=hwui hwuimacro and check hwuimacro has
PGO instrumentation.
Change-Id: I724b53dc086923beeb6f4b8903136545d18f4ece
2020-09-02 17:44:06 +00:00
Liz Kammer
4e7f2607ed
Add imports_compile_dex to prebuilt_apis
...
Allows specifying compile_dex for java_import modules generated by
prebuilt_apis.
Bug: 160455085
Test: m sdk_public_current_android
Change-Id: Id316ba740577b2c9c0522368c01072864cda6cca
2020-09-02 09:27:35 -07:00
Anton Hansson
7abd275906
Merge "Change sdk_library child visibility semantics" am: 3652018b83
am: 847ca7514e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1416192
Change-Id: Ib829749836c9683032ef97642b3ffa7a87bf47b9
2020-09-02 16:01:27 +00:00
Anton Hansson
22f993176e
[automerger skipped] Merge "java_sdk_library: Add annotations_enabled property" am: e0b81e4472
-s ours am: 0518ac8741
-s ours
...
am skip reason: Change-Id I8b23a959ce33716dfc4572488a1fd3f6bab73a17 with SHA-1 2ce1e81b3e
is in history
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1315815
Change-Id: Id09a1973020593f44495b32baeddd3d8c558af39
2020-09-02 16:01:14 +00:00
Anton Hansson
847ca7514e
Merge "Change sdk_library child visibility semantics" am: 3652018b83
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1416192
Change-Id: I6d013916d33618dab06447fbfd7ee0d9e2d09d7a
2020-09-02 15:56:58 +00:00
Anton Hansson
0518ac8741
[automerger skipped] Merge "java_sdk_library: Add annotations_enabled property" am: e0b81e4472
-s ours
...
am skip reason: Change-Id I8b23a959ce33716dfc4572488a1fd3f6bab73a17 with SHA-1 2ce1e81b3e
is in history
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1315815
Change-Id: Icbffb94c11128d5b41b65b5332051bd918d50a9c
2020-09-02 15:51:14 +00:00
Anton Hansson
3652018b83
Merge "Change sdk_library child visibility semantics"
2020-09-02 14:13:49 +00:00
Kousik Kumar
b3d9e7a436
[automerger skipped] [DO NOT MERGE] Do not add ccWrapper to ccNoDeps rule am: 65e10fba52
am: 51a6e42665
-s ours am: 45cc477eec
-s ours
...
am skip reason: Change-Id I60bb14ff92596e4992e9f675bdc199f1440d4327 with SHA-1 2976bfd568
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12467708
Change-Id: I6b95e509c474bb4e4ae44761f5f755dabdd9b217
2020-09-02 11:39:52 +00:00
Ramy Medhat
dd1d3f3eea
[automerger skipped] [DO NOT MERGE] Add support for experimentally enabling RBE support on specific rules. am: 4807a1b5ec
am: 5cde33dd78
-s ours am: ab718efebd
-s ours
...
am skip reason: Change-Id Ic82f3627944f6a5ee7b9f3228170c2709b1bfcb8 with SHA-1 8ea054a81e
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12467707
Change-Id: I9c9216a7e0ad2a25ee8693b4bfa33e1e715e9ec1
2020-09-02 11:39:45 +00:00
Ramy Medhat
070d3ca153
[automerger skipped] [DO NOT MERGE] Run non-RBE supported actions in the local pool when USE_RBE is set. am: c0d95df5d0
am: 06e62639a1
-s ours am: 2f01745433
-s ours
...
am skip reason: Change-Id I55074bd67308cd716972e24fb56a20bc393d5d9d with SHA-1 dd0418a4d4
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12467706
Change-Id: Ic87125f9b425a10ba6d5a243d8dd5e43a7e4beec
2020-09-02 11:39:38 +00:00
Colin Cross
45a5756b4a
[automerger skipped] [DO NOT MERGE] Use localPool consistently for UseGoma() == true am: 80059e69c7
am: f7c4e4682d
-s ours am: ef40322074
-s ours
...
am skip reason: Change-Id Id2bb38eff3c7209340fe55bc9006f00bd3661d81 with SHA-1 2e2dbc250a
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12467705
Change-Id: If01950f308360f3b95d876b6a3da1313d34a5160
2020-09-02 11:39:31 +00:00
Ramy Medhat
6b285b375e
[automerger skipped] [DO NOT MERGE] Add USE_RBE support to soong. am: adf591a505
am: 2445d7c41b
-s ours am: 87ef57fb08
-s ours
...
am skip reason: Change-Id I5bf008a940513872d70b5b215bd6209f759826ae with SHA-1 bbf2567cc1
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12467704
Change-Id: I23e66a86fbecf82112db3c62ba47d50b3fb2592c
2020-09-02 11:39:22 +00:00
Anton Hansson
e0b81e4472
Merge "java_sdk_library: Add annotations_enabled property"
2020-09-02 11:36:35 +00:00
Kousik Kumar
45cc477eec
[automerger skipped] [DO NOT MERGE] Do not add ccWrapper to ccNoDeps rule am: 65e10fba52
am: 51a6e42665
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12467708
Change-Id: I9de4024ff8d6e3e3e3122a3c5019883c19b1cfa4
2020-09-02 11:05:27 +00:00
Ramy Medhat
ab718efebd
[automerger skipped] [DO NOT MERGE] Add support for experimentally enabling RBE support on specific rules. am: 4807a1b5ec
am: 5cde33dd78
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12467707
Change-Id: I88a84a3d1850209247c06153cec1e8cd5dfd1075
2020-09-02 11:05:22 +00:00
Ramy Medhat
2f01745433
[automerger skipped] [DO NOT MERGE] Run non-RBE supported actions in the local pool when USE_RBE is set. am: c0d95df5d0
am: 06e62639a1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12467706
Change-Id: Ibc092ad3474bae9fd3b43824aa8c1f5bab2f0a27
2020-09-02 11:05:16 +00:00