Treehugger Robot
0c3fb0a262
Merge "Target dist files not dist goals." am: 2c2f75b2c1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2128475
Change-Id: Ib43503d4a4375eee7e91d178ad24fe730b788ba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-18 01:16:02 +00:00
Treehugger Robot
2c2f75b2c1
Merge "Target dist files not dist goals."
2022-06-18 00:59:56 +00:00
Bob Badour
722ab4a551
Merge "Revert "Revert "Record license text for every dist target.""" am: d9e88135ec
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2124808
Change-Id: I0634a13faf7fb20e1e69e8b617344bfb709eea05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 20:39:57 +00:00
Treehugger Robot
864682c77c
Merge "ignore .iml files (IntelliJ)" am: caf26acb1f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2128546
Change-Id: Icb497726562faca366d345669fa977975acb3e8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 20:39:45 +00:00
Bob Badour
d9e88135ec
Merge "Revert "Revert "Record license text for every dist target."""
2022-06-17 20:24:21 +00:00
Treehugger Robot
caf26acb1f
Merge "ignore .iml files (IntelliJ)"
2022-06-17 20:18:25 +00:00
Anton Hansson
f32703af03
Merge "Don't exclude docs build from using prebuilts" am: 670fed3df4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2125157
Change-Id: I0b9cba550d79eead98ef623c482f128bd0546e32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 20:13:56 +00:00
Bob Badour
0b907f3944
Target dist files not dist goals.
...
It turns out dist goals do not map well to units of code distributed.
They often build a combination of files to distribute and files for
internal use only.
This change creates license texts and lists of projects to share for
individual files in dist instead of for dist goals.
If a distribution needs the license texts for part of a dist file or
for a combination of multiple files, whoever is distributing will have
to create a suitable text notice using `gen_notice{}` or `testnotice`
and include it among the dist files for the goal using `dist-for-goals`
or equivalent.
Bug: 151177513
Bug: 210912771
Bug: 235333302
Bug: 232138105
Bug: 235302632
Test: m cts dist
Test: m droid dist
Test: tapas google-tradefed-all && m dist
Change-Id: Id78f032575a2ac1a3cc70643b3ae4d2e6c32da04
2022-06-17 13:11:22 -07:00
Treehugger Robot
8ee99853c3
Merge "Inline some variables that are only used in 1 place" am: a2ed2629c6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2128120
Change-Id: If273bb421d223269f6e4e40bf57a2b9548bb94c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 20:10:08 +00:00
Anton Hansson
670fed3df4
Merge "Don't exclude docs build from using prebuilts"
2022-06-17 16:56:32 +00:00
Usta Shrestha
4d69479b88
ignore .iml files (IntelliJ)
...
Test: N/A
Bug: N/A
Change-Id: I8917fd887b86a39c056d7bf04fd647fc8172c398
2022-06-17 12:17:53 -04:00
Treehugger Robot
a2ed2629c6
Merge "Inline some variables that are only used in 1 place"
2022-06-17 04:54:43 +00:00
Xin Li
449fa2bee5
[automerger skipped] Merge "Merge Android 12 QPR 3" am: 91c2117fdb
-s ours
...
am skip reason: Merged-In I49d7623a21508cc57683f4853b22994e83116303 with SHA-1 388494bd87
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2126114
Change-Id: I2d975eedc1558924fffbe5b5e236ef32907cf20f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 19:58:13 +00:00
Xin Li
b4f5716323
[automerger skipped] Merge Android 12 QPR 3 am: b9463f81eb
-s ours
...
am skip reason: Merged-In I49d7623a21508cc57683f4853b22994e83116303 with SHA-1 388494bd87
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2126114
Change-Id: Id7c2815911d4d7a4e63a96ba3bf630e3e04a6b02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 19:57:02 +00:00
Xin Li
91c2117fdb
Merge "Merge Android 12 QPR 3"
2022-06-16 18:51:57 +00:00
Cole Faust
8fc7befdbb
Inline some variables that are only used in 1 place
...
Test: Presubmits
Change-Id: Ic72fdb6c401f345ecfcaacb0179a9a3cd6a13e9d
2022-06-15 16:10:49 -07:00
Dan Willemsen
fa7bb8304a
Merge "Fix potential error for sys.platform" am: 59f36c1950
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2127932
Change-Id: I81c2fb11fdf2958ea37d4b81548232b120d2c2ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 20:23:47 +00:00
Bob Badour
dce80abbe3
Revert "Revert "Record license text for every dist target.""
...
This reverts commit 1e27f4fff9
.
Reason for revert: Rolling forward again without 'all' target.
Bug: 151177513
Bug: 210912771
Bug: 235333302
Bug: 232138105
Test: m droid dist reportmissinglicenses
Test: tapas google-tradefed-all && m dist
Change-Id: I392047ec50ac6e74b9accf260c62e77aef1640d5
2022-06-15 13:06:18 -07:00
Dan Willemsen
59f36c1950
Merge "Fix potential error for sys.platform"
2022-06-15 20:02:04 +00:00
Anton Hansson
c9a5d76f32
Don't exclude docs build from using prebuilts
...
Even though it doesn't have google modules in PRODUCT_PACKAGES,
the docs build wants to use prebuilts when the rest of the branch
does.
Bug: 230478310
Test: m docs (inspect MODULE_BUILD_FROM_SOURCE)
Merged-In: I1d67f4099e9fdc5fbaeeb0bf0fce80aa91c05eb5
Change-Id: I1d67f4099e9fdc5fbaeeb0bf0fce80aa91c05eb5
2022-06-15 17:59:49 +00:00
Treehugger Robot
7660d6a3a7
Merge "Revert "Revert "Revert "Revert "Create lists of projects to share per dist target""""" am: 6f30351970
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2124807
Change-Id: I4b980e4994c0f9928cf57275353c9964f4b974ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 16:34:41 +00:00
Treehugger Robot
6f30351970
Merge "Revert "Revert "Revert "Revert "Create lists of projects to share per dist target"""""
2022-06-15 16:09:27 +00:00
jiajia tang
7e0c12b1ba
Fix potential error for sys.platform
...
This CL is to fix gap between python2.x and 3.x.
For python2.x: sys.platform returns 'linux2'
For python3.x: sys.platform returns 'linux'
python3.x(https://docs.python.org/3.6/library/sys.html#sys.platform )
python2.x(https://docs.python.org/2.7/library/sys.html#sys.platform )
Both 2.x and 3.x recommend to use 'startswith' to identify sys.platform.
Change-Id: Id5a0a007518b329d1320baf96ecf1164cd3ebec1
Signed-off-by: jiajia tang <tangjiajia@xiaomi.com >
2022-06-15 15:06:38 +00:00
Xin Li
b9463f81eb
Merge Android 12 QPR 3
...
Bug: 236045730
Merged-In: I49d7623a21508cc57683f4853b22994e83116303
Change-Id: I1d4b900a260970c404d3cea016023332cfbedb24
2022-06-14 16:39:40 -07:00
Bob Badour
d227fac95b
Revert "Revert "Revert "Revert "Create lists of projects to share per dist target""""
...
This reverts commit 398bd87950
.
Reason for revert: Rolling forward again without 'all' target.
Bug: 151177513
Bug: 210912771
Bug: 235333302
Bug: 232138105
Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_coral_hwasan TARGET_BUILD_VARIANT=userdebug droid dist with-license platform_tests continuous_instrumentation_tests continuous_native_tests
Test: tapas google-tradefed-all && m dist
Change-Id: I1e5f5639ebf1fa61060124a5183f6f0a2ece04b5
2022-06-14 11:33:54 -07:00
Treehugger Robot
388494bd87
Merge "Revert "Revert "Revert "Create lists of projects to share per dist target"""" am: 6ebfaa453b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2124432
Change-Id: I49d7623a21508cc57683f4853b22994e83116303
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 09:20:34 +00:00
Treehugger Robot
6ebfaa453b
Merge "Revert "Revert "Revert "Create lists of projects to share per dist target""""
2022-06-14 08:36:14 +00:00
Treehugger Robot
dfa0aa9bc1
Merge "Revert "Record license text for every dist target."" am: 68975ad0fd
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2124433
Change-Id: I3a3970d24b475ff0dde01a98399f105731d76154
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 00:28:14 +00:00
Bob Badour
398bd87950
Revert "Revert "Revert "Create lists of projects to share per dist target"""
...
This reverts commit 82040d9882
.
Reason for revert: Advised to switch to using TARGET_BUILD_APPS
Change-Id: If56a1fceb5da66b90b7b0ec2275ec429661515b4
2022-06-14 00:03:23 +00:00
Treehugger Robot
68975ad0fd
Merge "Revert "Record license text for every dist target.""
2022-06-13 23:47:32 +00:00
Treehugger Robot
b81dd0cf21
Merge "Revert "Dexpreopt: prepare to merge class loader context from al..."" am: 1818a57e87
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2123353
Change-Id: Ib1bd416c4a7c75c9e8d773f5718ed17341253192
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 23:03:12 +00:00
Treehugger Robot
1818a57e87
Merge "Revert "Dexpreopt: prepare to merge class loader context from al...""
2022-06-13 22:21:40 +00:00
Bob Badour
1e27f4fff9
Revert "Record license text for every dist target."
...
This reverts commit 5c0ec6a5a6
.
Reason for revert: Advised to switch to using TARGET_BUILD_APPS
Change-Id: I1442998bbafe909a0796abdb2e9691a0c4c099d6
2022-06-13 19:38:01 +00:00
Jiakai Zhang
21d0333357
Merge "Set TARGET_USES_64_BIT_BINDER
for mainline_sdk." am: d02946c4c3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2121572
Change-Id: I40e650cf5fbb39607b2db295969836b5ab5cf837
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 09:27:51 +00:00
Jiakai Zhang
d02946c4c3
Merge "Set TARGET_USES_64_BIT_BINDER
for mainline_sdk."
2022-06-13 09:11:29 +00:00
Ulya Trofimovich
8b9f334eed
Revert "Dexpreopt: prepare to merge class loader context from al..."
...
Reason for revert: performance regression on AppStartup.
Reverted Changes:
I6522319a8:Dexpreopt: prepare to merge class loader context f...
Ic8528dffd:manifest_check.py: add uses-libraries propagaged v...
Bug: 235304939
Bug: 214255490
Change-Id: Iff6ad6f0d862df259bf9e3dd7017c268dbcbf8bf
2022-06-13 09:06:59 +00:00
Yi-yo Chiang
4acadd0afe
Merge "Add ro.force.debuggable=0 to ADDITIONAL_SYSTEM_PROPERTIES" am: 109f63823b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2120223
Change-Id: Iff04ab49e4ce32c72ea1ea5dd7728fc5624eb70d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 06:41:14 +00:00
Yi-yo Chiang
109f63823b
Merge "Add ro.force.debuggable=0 to ADDITIONAL_SYSTEM_PROPERTIES"
2022-06-13 06:17:47 +00:00
Treehugger Robot
4c3372bdf9
Merge "Add wifi_module/source_build Soong config variable" am: aa3bc3be79
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2121573
Change-Id: Ic2bd289081f4b6e7a52086df4879350284abe339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 19:45:31 +00:00
Treehugger Robot
1e80852887
Merge "Record license text for every dist target." am: f0bb8291c8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2115690
Change-Id: I2f11886c8c64c7d239cdac8a91bde83920b9106d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 19:44:38 +00:00
Treehugger Robot
f4cf61e9b8
Merge "Revert "Revert "Create lists of projects to share per dist target""" am: e25ddc0453
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2066749
Change-Id: I862a320ebd81067b6a2a467540e89c18c8f2752c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 19:42:22 +00:00
Treehugger Robot
aa3bc3be79
Merge "Add wifi_module/source_build Soong config variable"
2022-06-10 18:46:17 +00:00
Treehugger Robot
f0bb8291c8
Merge "Record license text for every dist target."
2022-06-10 18:09:41 +00:00
Treehugger Robot
e25ddc0453
Merge "Revert "Revert "Create lists of projects to share per dist target"""
2022-06-10 18:09:03 +00:00
Jiakai Zhang
f5637f94fe
Set TARGET_USES_64_BIT_BINDER
for mainline_sdk.
...
Devices are all using 64 bit binder, and mainline_sdk should too.
According the comment here: https://cs.android.com/android/platform/superproject/+/master:build/make/target/board/BoardConfigMainlineCommon.mk;l=25;drc=6e7693f1597a0934833a72faf35e918dfbdb6ecd ,
this flag is required even for non-64 bit devices.
`libbinder` doesn't compile on host with 32 bit binder.
Test: packages/modules/common/build/mainline_modules_sdks.sh \
--build-platform-sdks-for-mainline --build-release=latest
Change-Id: I357ce42e88ad13ed259d573b9dd2bbfc27b82687
2022-06-10 14:35:53 +01:00
Paul Duffin
4f4b6d776d
Add wifi_module/source_build Soong config variable
...
As an optional module, wifi has its own Soong config variable. This
change ensures that it is controlled by the same environment variable
as the rest of the modules.
Bug: 233965247
Test: # Unpack wifi snapshot that uses wifi specific Soong config.
m nothing
# Without this the build fails as it uses the wifi prebuilts
# which do not work in AOSP.
# With this change the build passes as it uses the wifi
# sources.
Change-Id: Iea0ad09182a162b8f5ddf1403f65a3bbffb9ef08
2022-06-10 11:26:16 +00:00
Yi-Yo Chiang
70b69de18a
Add ro.force.debuggable=0 to ADDITIONAL_SYSTEM_PROPERTIES
...
This should only be set to '1' by flashing debug boot image,
so default to '0' in system/build.prop.
Bug: 223517900
Test: Boot with and without debug boot image and check value of property
Change-Id: I0e0df7d86a31fd771248433513483e8ad600b5ed
2022-06-10 15:28:31 +08:00
Treehugger Robot
d810636ae4
Merge "Obsolete BOARD_PLAT_*_SEPOLICY_DIR" am: 7e91201269
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2120476
Change-Id: I63d345a786fafc39668922be2ea230e6518cff9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 02:16:03 +00:00
Treehugger Robot
7e91201269
Merge "Obsolete BOARD_PLAT_*_SEPOLICY_DIR"
2022-06-10 01:56:16 +00:00
Dan Willemsen
b34c387441
Obsolete BOARD_PLAT_*_SEPOLICY_DIR
...
These were marked as deprecated in late 2020 [1]. Shortly later, there
was an attempt to obsolete them [2] for products shipping with API level
31 or greater, but that was reverted [3] because of internal users.
1: I58c64839cc513ae082cd3ee3c1e108843ea7439e
2: Ic4d1164be611836f6aa697fbf1cb1f1c73a3cd39
3: I7d3556aa0f06684b43f80f09e4c8194c6c44336c
Since these are causing warnings on every build, and there are no more
internal users, just obsolete them entirely. We don't need to rely on
the product shipping api level, since that does not guarantee
source-level compatibility -- and this is an easy fix even if people
have been ignoring the real warnings.
Bug: 235414673
Test: treehugger
Change-Id: If803a33efc38a970247919bf224c12b8c717f955
2022-06-09 09:36:52 -07:00