StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,354 Commits 1 Branch 0 Tags
adfe90de1f3cfc30dc7255914182cc6b51a09fb6
Commit Graph

80354 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bob Badour
96e20b45fd Merge "Revert "Revert "Record license text for every dist target.""" am: d9e88135ec am: 722ab4a551 
Original change: https://android-review.googlesource.com/c/platform/build/+/2124808

Change-Id: Icce2421cd424d099c02f40cdd92fa5c33d739a7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 20:58:52 +00:00
Treehugger Robot
fbfe2c0cf1 Merge "ignore .iml files (IntelliJ)" am: caf26acb1f am: 864682c77c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2128546

Change-Id: I5d5acb7e15fb18c413df940dd2257fa6fa0e4138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 20:58:42 +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
Anton Hansson
68ce6c8d7c [automerger skipped] Merge "Don't exclude docs build from using prebuilts" am: 670fed3df4 am: f32703af03 -s ours 
am skip reason: Merged-In I1d67f4099e9fdc5fbaeeb0bf0fce80aa91c05eb5 with SHA-1 ad0ef270db is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2125157

Change-Id: Ib45be757f641673bf3e38a5e5143c647fa146f2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 20:32:56 +00:00
Treehugger Robot
d385eb71cd Merge "Inline some variables that are only used in 1 place" am: a2ed2629c6 am: 8ee99853c3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2128120

Change-Id: I4bc925cf9dddd10e5824b8f8b16afca03338a9a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 20:32:05 +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
Android Build Coastguard Worker
39675fb7f3 Version bump to TP1A.220617.003 [core/build_id.mk] 
Change-Id: I6ad181f68a4027aa023f4ae9b9e9ef27cfbde00f
 2022-06-17 14:47:11 +00:00
Android Build Coastguard Worker
ee6b08e1a2 Version bump to TP1A.220617.002 [core/build_id.mk] 
Change-Id: I40d6f95886baf91e954c38460e6227f7997432a3
 2022-06-17 06:29:23 +00:00
Xin Li
26a43c5e24 Merge SQ3A.220605.009 
Bug: 236045730
Merged-In: Iac5d1f2b0c48bf5ff7dc89d00d49944e764cec5c
Change-Id: Ibb3c3083d8d57179f37dd12547b036fa2af6c46d
 2022-06-16 22:36:08 -07: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
dfb315c443 [automerger skipped] Merge "Merge Android 12 QPR 3" am: 91c2117fdb -s ours am: 449fa2bee5 -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: I098393a4598a8db8404b1bc9e012d90f7bb5220e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 00:15:14 +00:00
Xin Li
ffdae997e8 [automerger skipped] Merge Android 12 QPR 3 am: b9463f81eb -s ours am: b4f5716323 -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: Ib1b7beaac12b62aa3afd12e2cf974a41b99ed97e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 00:14:10 +00:00
Bassem Khalife
455ec3075a Update Security String to 2022-08-05 am: 9f2be867c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18911707

Change-Id: I11c9815c01461fb331e068ca55b2eca4c160a06d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 00:07:04 +00:00
Android Build Coastguard Worker
97c82ef1ac Make change and version bump to TP1A.220617.001 
Change-Id: Ie915740eb8585047c3f572cf0a96f0b9383dff4b
 2022-06-17 00:06:40 +00:00
Chris Wailes
197429ccb0 Add USAP related system properties 
Test: Build; flash; set property; check device state
Bug: 161725679
Change-Id: I68fd45de51e20ad696e4a0e3201fb89031e97e5e
 2022-06-16 23:39:23 +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
Jooyung Han
29693cec7b Merge "Remove AIDL libs from VNDK libs" into tm-dev-plus-aosp 2022-06-16 01:28:41 +00:00
Android Build Coastguard Worker
67599aa5f3 Make change and version bump to TP1A.220616.001 
Change-Id: If2d02ef246a80ca94af9440a9d997294301fcf50
 2022-06-15 23:57:36 +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
Bassem Khalife
2489eee173 Update Security String to 2022-08-01 
Bug: 232157623

Change-Id: Ief202c2f8b37d686397560df599d2143d763ba65
Merged-In: Ief202c2f8b37d686397560df599d2143d763ba65
 2022-06-15 22:02:46 +00:00
Bassem Khalife
9f2be867c4 Update Security String to 2022-08-05 
Bug: 232157623
Change-Id: Ief202c2f8b37d686397560df599d2143d763ba65
 2022-06-15 21:58:56 +00:00
Dan Willemsen
6b2bd9d652 Merge "Fix potential error for sys.platform" am: 59f36c1950 am: fa7bb8304a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2127932

Change-Id: I9ab6f15da248c7be9b73df84da0a67787b291167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 21:12:26 +00: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
18f349b4fc Merge "Don't exclude docs build from using prebuilts" into tm-dev am: 29ae21ebb7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18886329

Change-Id: I29f6b344b3edf6b7740f6cfd10b304cd1ea6a786
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 18:19:23 +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
Anton Hansson
29ae21ebb7 Merge "Don't exclude docs build from using prebuilts" into tm-dev 2022-06-15 17:59:25 +00:00
Treehugger Robot
67fa5b53f4 Merge "Revert "Revert "Revert "Revert "Create lists of projects to share per dist target""""" am: 6f30351970 am: 7660d6a3a7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2124807

Change-Id: I0b6ebdce2ed8243bfed7c7ef1f19e37ceebaf367
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 17:01:46 +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
Android Build Coastguard Worker
5e935a5420 Make change and version bump to TP1A.220615.001 
Change-Id: I12225b8a0ea4f97ab7ff4ac55886c8a940ccbcbc
 2022-06-14 23:58:33 +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
Bob Badour
be403f9c69 [automerger skipped] Merge changes from topic "revert-18821068-NTXTBFFANH" into tm-dev am: 0e729cfc1d -s ours 
am skip reason: Merged-In If56a1fceb5da66b90b7b0ec2275ec429661515b4 with SHA-1 398bd87950 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18874017

Change-Id: I105a9b412188e038868098b30ef8503c9a0cc21e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 16:48:43 +00:00
Bob Badour
884a93c187 [automerger skipped] Revert "Create lists of projects to share per dist target" am: 7960535739 -s ours 
am skip reason: Merged-In If56a1fceb5da66b90b7b0ec2275ec429661515b4 with SHA-1 398bd87950 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18874017

Change-Id: Ia76618f55ca8225d81ee911ad7a126ca6dd4c524
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 16:48:41 +00:00
Bob Badour
0e729cfc1d Merge changes from topic "revert-18821068-NTXTBFFANH" into tm-dev 
* changes:
  Revert "Create lists of projects to share per dist target"
  Revert "Record license text for every dist target."
 2022-06-14 14:48:48 +00:00
Anton Hansson
ad0ef270db 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)
Change-Id: I1d67f4099e9fdc5fbaeeb0bf0fce80aa91c05eb5
 2022-06-14 13:43:37 +00:00
Treehugger Robot
e759d23d01 Merge "Revert "Revert "Revert "Create lists of projects to share per dist target"""" am: 6ebfaa453b am: 388494bd87 
Original change: https://android-review.googlesource.com/c/platform/build/+/2124432

Change-Id: Iccbe21894f0f7d1098f87f9f512fe5226a0eb67a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 09:48:18 +00: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