StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
97,955 Commits 1 Branch 0 Tags
c91e5d65b0ffa2634b5562a7a6d0f95b97ae5ae6
Commit Graph

1211 Commits

Author SHA1 Message Date
Colin Cross
3b89c6532a Support Soong-generated module-info.json entries 
Allow Soong modules to generate their own module-info.json entries
by merging Soong's module-info.json file into the one generated in
Make.

Skip collecting unnecessary ALL_MODULES.$(my_register_name).*
that are only used for module-info.json if the module was already
handled by Soong via the LOCAL_SOONG_MODULE_INFO_JSON property.

Bug: 309006256
Test: Compare module-info.json
Change-Id: I2c9db3c7c7bae7bd6cb889d7ebc2e383c278c82d
 2024-01-02 17:21:22 -08:00
Colin Cross
23a54e11ab Merge "Simplify module-info.json by leaving out optional fields" into main am: 8bb8482755 am: 78c9696aea am: 84035d9743 
Original change: https://android-review.googlesource.com/c/platform/build/+/2835094

Change-Id: Id7f1e3dd8f568cf1cd173cde59d8cb7a558535e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-05 02:15:45 +00:00
Colin Cross
4ea5e85143 Simplify module-info.json by leaving out optional fields 
Every field in module-info.json has at least "[]".  Add functions to
only write the values when they are non-empty to reduce the size
and ease comparison when module-info.json is written by Soong.

Bug: 309006256
Test: atest --host toybox-gtests --test-timeout=120000
Change-Id: I200e8c8fd9727b4cffa9b82318f4433fd630e933
 2023-11-29 10:18:52 -08:00
Colin Cross
8c10c1abc3 Merge "Store ALL_DEPS under my_register_name" into main am: 6b35685744 am: a9b72f9311 am: b62c7d7a49 
Original change: https://android-review.googlesource.com/c/platform/build/+/2835092

Change-Id: Ib4294dc19ebea2bb3ef94321995e44636119e1d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-17 22:47:33 +00:00
Colin Cross
9cb51b7446 Store ALL_DEPS under my_register_name 
ALL_DEPS was original stored in ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS for
use by the old licensing code.  That has been removed, and it is now
only used by module-info.json.  Storing it with $(LOCAL_MODULE) causes
_32 entries in module-info.json to be missing dependencies, and causes
the dependencies from _32 variants to be squashed into the normal
variants.  Replace ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS with
ALL_MODULES.$(my_register_name).ALL_DEPS.

Test: builds
Change-Id: Ieddfcddd8547b61bd938ae051beb738268aac5af
 2023-11-16 11:46:40 -08:00
Colin Cross
b874694de5 Merge changes I2ca9e674,I7e0db3c0,I7e1b6268,I0fa6a46e,I04e8178a into main am: b5ec156b32 am: 6281ca70d0 am: 4354a51b61 
Original change: https://android-review.googlesource.com/c/platform/build/+/2815683

Change-Id: Ief41c26347b063163bf45d3cd0a39468fdb0f650
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-03 17:01:05 +00:00
Colin Cross
1b7f072505 Remove obsolete ide.mk and related code 
The code to generate an eclipse classpath is obsolete, remove it and
related code.

Test: no change to out/build-aosp_cf_x86_64_phone.ninja
Change-Id: I7e1b6268b98ecbb7be88db8945dd7b30acc695ba
 2023-11-02 10:16:57 -07:00
Jeff Hamilton
426a9f8f02 Move most version variable out to relase configs. 
This allows finer control of the version variables
per release config, and removes a lot of computed
logic in favor of just directly setting the values.

Bug: 306702353
Test: lunch <device>-next-userdebug && m -j98
Change-Id: I9edc7171d124f0cfa540fea6f0e06ba877910444
Ignore-AOSP-First: Changes in internal projects first.
Merged-In: I9edc7171d124f0cfa540fea6f0e06ba877910444
 2023-10-24 16:41:58 +00:00
Baligh Uddin
186888303d Revert^2 "Move most version variable out to relase configs." 
69b38b52b6

Change-Id: I67c9ac7869fcad54f3b0b93a04e9dda5f97861d6
Bug: 306702353
Test: TH and local
 2023-10-24 14:19:52 +00:00
Orhan Uysal
69b38b52b6 Revert "Move most version variable out to relase configs." 
Revert submission 25118098-ap11

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.corp.google.com/builds/quarterdeck?branch=git_aosp-main-future&target=errorprone-trunk_staging&lkgb=10993884&lkbb=10995208&fkbb=10994141, bug b/307480895

Reverted changes: /q/submissionid:25118098-ap11

Change-Id: I2bc1fc4a9e92a3c4cf8acba3dbaaf61e6fb0774e
 2023-10-24 09:03:24 +00:00
Jeff Hamilton
c40f31641b Move most version variable out to relase configs. 
This allows finer control of the version variables
per release config, and removes a lot of computed
logic in favor of just directly setting the values.

Bug: 306702353
Test: lunch <device>-next-userdebug && m -j98
Change-Id: I9edc7171d124f0cfa540fea6f0e06ba877910444
Ignore-AOSP-First: Changes in internal projects first.
 2023-10-23 21:54:57 +00:00
Edward Liaw
0777cb9093 Merge "linux-kselftest: Remove special cased build rule for kselftest" into main am: 41d4b0b3af am: a06534686f am: 6dee758b82 am: fe92cbefdd am: 71fb4d0c46 
Original change: https://android-review.googlesource.com/c/platform/build/+/2736953

Change-Id: Ic7750ef74717cc836941c3de1403fff2f0b51b53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 03:55:03 +00:00
Edward Liaw
a06534686f Merge "linux-kselftest: Remove special cased build rule for kselftest" into main am: 41d4b0b3af 
Original change: https://android-review.googlesource.com/c/platform/build/+/2736953

Change-Id: Ia5a3c3ed37738c58404dc7a9ea78d74bd509ead2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 01:48:39 +00:00
Edward Liaw
41d4b0b3af Merge "linux-kselftest: Remove special cased build rule for kselftest" into main 2023-10-05 01:08:32 +00:00
Treehugger Robot
70948c50f4 Merge "Delete staging directory after creating module package zip" into main am: 517308b890 am: 5a5685a6a9 am: 4ed24d84ed am: 8191024e42 am: 0da0f0a2ec 
Original change: https://android-review.googlesource.com/c/platform/build/+/2767637

Change-Id: I5aa8a6ef92d244367896610aedcff01970f095f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-30 06:14:49 +00:00
Treehugger Robot
5a5685a6a9 Merge "Delete staging directory after creating module package zip" into main am: 517308b890 
Original change: https://android-review.googlesource.com/c/platform/build/+/2767637

Change-Id: I560705e092b2ee8d0e0a5b5ed6786b9aa307dff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-30 02:02:18 +00:00
Colin Cross
585967c08a Delete staging directory after creating module package zip 
The staging directory isn't used after the module packaging zip is
built.  Delete the staging directory to reduce disk usage without
affecting incremental build performance.

Bug: 302573555
Change-Id: I377c60714f78760d0b6c2588935c12e10a9ed224
Test: treehugger
 2023-09-30 00:37:38 +00:00
Edward Liaw
ba282927bf linux-kselftest: Remove special cased build rule for kselftest 
Bug: 277261121
Bug: 293945424
Test: m vts
Change-Id: I1c5992730958645e96037fa01a5c110cf410753b
Signed-off-by: Edward Liaw <edliaw@google.com>
 2023-09-15 22:49:17 +00:00
Xin Li
be1435290d Merge Android U (ab/10368041) 
Bug: 291102124
Merged-In: If9360ebd0acebe85f42f89a268c316d51c765708
Change-Id: I58470464a3239a2ad8e82e4821bb27a2892a8302
 2023-08-25 13:25:26 -07:00
Treehugger Robot
a13966114b Merge "Don't check the codename for REL configuration." into main am: 987e6ba3f2 am: 9488c6c0ea am: ba0e5d4f76 am: f9b8392ee3 am: beabe0f42f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2717722

Change-Id: I362409c5b9f93cdcb7ca20ccd79781acf02e60b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-20 01:55:15 +00:00
Treehugger Robot
ba0e5d4f76 Merge "Don't check the codename for REL configuration." into main am: 987e6ba3f2 am: 9488c6c0ea 
Original change: https://android-review.googlesource.com/c/platform/build/+/2717722

Change-Id: I5087fc66f4e5b3a9b49456760b7113e4ab03a2d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-20 00:13:32 +00:00
Alex Buynytskyy
be87e19e67 Don't check the codename for REL configuration. 
Bug: 294161396
Test: m
Change-Id: I905801fdb6520b430f15f219ae4cd89be74065a5
 2023-08-19 00:07:16 +00:00
LaMont Jones
0e4634643a Merge changes from topic "mod-info-foreach" into main am: e75c063d1f am: 4bbf7a86af am: 53ddfdb0f2 am: ae970ba410 am: bb93615198 
Original change: https://android-review.googlesource.com/c/platform/build/+/2617522

Change-Id: Ieb2b8dcc21af8938c69e8b3f1550b379951eb59a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 03:12:38 +00:00
LaMont Jones
53ddfdb0f2 Merge changes from topic "mod-info-foreach" into main am: e75c063d1f am: 4bbf7a86af 
Original change: https://android-review.googlesource.com/c/platform/build/+/2617522

Change-Id: If6d6a995bcb3496f65b0378e98afe2ecaed34758
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 01:22:53 +00:00
LaMont Jones
3a9ce1d6ea Reduce spaces in module-info.json 
Test: manual, presubmit
Change-Id: I79b94206d636b3ac1f4e88eca514057e4613cbfa
 2023-07-12 23:17:05 +00:00
LaMont Jones
edc62e8ffe use KATI_foreach_sep in module-info.json rules 
Test: manual, presubmit
Change-Id: I0be472cd5c35eeb8f44c7b9184d961d975f6137a
 2023-07-12 23:17:05 +00:00
Sorin Basca
806c230233 Merge "Add test utils script to xTS zips" am: e029e1e7ba am: f32074304e am: 35ff4ec982 am: 10738e13c6 am: 09dd9c9b41 am: c7e61b3ba4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2361760

Change-Id: I9c7cb525b5b74b163f21eea1e522cb7b56c696a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-06 00:30:46 +00:00
Sorin Basca
10738e13c6 Merge "Add test utils script to xTS zips" am: e029e1e7ba am: f32074304e am: 35ff4ec982 
Original change: https://android-review.googlesource.com/c/platform/build/+/2361760

Change-Id: I9dd62248447361166243e3877efbed9863056bc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-05 19:35:35 +00:00
Sorin Basca
e029e1e7ba Merge "Add test utils script to xTS zips" 2023-07-05 17:23:30 +00:00
Treehugger Robot
f480fdeaa7 Merge "add sha256 to art-host-tests zip to lower rbe upload overhead" am: 6d2b198f87 am: dad161c5e8 am: ae9d03e612 am: b124890786 am: f5918af272 am: 52c01dc13c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2640232

Change-Id: I34263c47e866194144323ade275e6138533e7fdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-29 10:13:09 +00:00
Treehugger Robot
b124890786 Merge "add sha256 to art-host-tests zip to lower rbe upload overhead" am: 6d2b198f87 am: dad161c5e8 am: ae9d03e612 
Original change: https://android-review.googlesource.com/c/platform/build/+/2640232

Change-Id: Ie2cd053895edbaadc23bcf05014844004a9404de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-29 07:59:03 +00:00
Julien Desprez
7b94cc7170 add sha256 to art-host-tests zip to lower rbe upload overhead 
Avoid a cas unzip/upload by using the soong_zip option

Change-Id: I4ef8571a43ccf49d01e876605759e82f8e87dbc5
Test: presubmit
Bug: 286959075
 2023-06-29 00:18:38 +00:00
Sorin Basca
b5a59eaf22 Add test utils script to xTS zips 
Test: m cts && unzip android-cts.zip && ./cts-trafed
Change-Id: Iee05bdb03e949eb2f70c9f754190242bc47e5f4e
 2023-06-27 19:46:00 +01:00
Devin Moore
b9f1d73857 Merge "Add static_libs to module-info.json" am: b1bae84508 am: 32267a425f am: 4211e25233 am: bdce6803a2 am: 6c3a379a2e am: 522302a97e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2590127

Change-Id: I42eb674277960edbd79c9170faac98b6275286c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 19:44:39 +00:00
Devin Moore
bdce6803a2 Merge "Add static_libs to module-info.json" am: b1bae84508 am: 32267a425f am: 4211e25233 
Original change: https://android-review.googlesource.com/c/platform/build/+/2590127

Change-Id: I93fe105315ca283210b1cd156c4e77fbe3c023b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 17:40:54 +00:00
Devin Moore
32267a425f Merge "Add static_libs to module-info.json" am: b1bae84508 
Original change: https://android-review.googlesource.com/c/platform/build/+/2590127

Change-Id: I998c016d06dfd67ab09501898ebd4e1b2ab23f5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 16:13:09 +00:00
Devin Moore
48d7b3462d Add static_libs to module-info.json 
This is helpful for analyzing how often a library is included statically
on a device. If a large library is linked statically in many processes
in a single device, it may be a good candidate for shared linking
instead.

This increases the size of module-info.json file on Cuttlefish by ~12.5%
from 65MB to 72MB.

Test: m
Bug: 280829178
Change-Id: I3614d86d799810e1ce845e1097f43f1ec0a412a3
 2023-06-05 20:17:50 +00:00
Jeongik Cha
f295008821 BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration am: 05210f96b3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2563995

Change-Id: Ieaa619837f1c212265075ea59ddc74be34afd783
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 09:28:02 +00:00
Jeongik Cha
43aaa8989e BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration am: d0b037235d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23378947

Change-Id: I0fef5b60fe9f2aeeff7d09b55901782f3fcd8df2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 02:07:17 +00:00
Jeongik Cha
d0b037235d BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration 
* Extract BUILD_NUMBER, BUILD_HOSTNAME to file to avoid kati change
* Handle FILE_NAME_TAG_PLACEHOLDER string in dist in build/make/packaging/distdir.mk

Ignore-AOSP-First: there are internal use cases of FILE_NAME_TAG
Test: check if kati isn't invoked even though BUILD_NUMBER, BUILD_HOSTNAME
  is changed
Test: m && m, and check if the second m is no-op
Bug: 278060169
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7b40aa8338ba85a58ee481fe6bafac2959f7112b)
Merged-In: I1b37760242853c1a145bad255d0bb15524234b25
Change-Id: I1b37760242853c1a145bad255d0bb15524234b25
 2023-05-22 22:42:07 +00:00
Jeongik Cha
05210f96b3 BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration 
* Extract BUILD_NUMBER, BUILD_HOSTNAME to file to avoid kati change
* Handle FILE_NAME_TAG_PLACEHOLDER string in dist in build/make/packaging/distdir.mk

Test: check if kati isn't invoked even though BUILD_NUMBER, BUILD_HOSTNAME
  is changed
Test: m && m, and check if the second m is no-op
Bug: 278060169
Change-Id: I1b37760242853c1a145bad255d0bb15524234b25
Merged-In: I1b37760242853c1a145bad255d0bb15524234b25
 2023-05-23 07:14:22 +09:00
Jeongik Cha
7b40aa8338 BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration 
* Extract BUILD_NUMBER, BUILD_HOSTNAME to file to avoid kati change
* Handle FILE_NAME_TAG_PLACEHOLDER string in dist in build/make/packaging/distdir.mk

Ignore-AOSP-First: there are internal use cases of FILE_NAME_TAG
Test: check if kati isn't invoked even though BUILD_NUMBER, BUILD_HOSTNAME
  is changed
Test: m && m, and check if the second m is no-op
Bug: 278060169
Change-Id: I1b37760242853c1a145bad255d0bb15524234b25
 2023-05-22 15:50:16 +09:00
Treehugger Robot
337642bf31 Merge "Remove gpl_source.tgz" am: 48a8afe677 am: 0d73e67d39 am: b3d5d43b15 am: cb424db193 am: 98aae0b489 am: ffb275b6d1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2584219

Change-Id: I5fb901636f143584aca1dad8fecea9ac5fa1c324
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-16 01:50:21 +00:00
Treehugger Robot
cb424db193 Merge "Remove gpl_source.tgz" am: 48a8afe677 am: 0d73e67d39 am: b3d5d43b15 
Original change: https://android-review.googlesource.com/c/platform/build/+/2584219

Change-Id: Ic20b2515ee2f3c81d9a80827f6fb1bd0d9bf6e27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 23:36:59 +00:00
Treehugger Robot
0d73e67d39 Merge "Remove gpl_source.tgz" am: 48a8afe677 
Original change: https://android-review.googlesource.com/c/platform/build/+/2584219

Change-Id: I9db9146283f4775281a1c049c1f15a17f74d818d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 22:10:55 +00:00
Treehugger Robot
48a8afe677 Merge "Remove gpl_source.tgz" 2023-05-15 21:36:32 +00:00
Treehugger Robot
3b7bde8df1 Merge "Only search for test suite jdk files once" am: 6961b14269 am: e72f71968a am: 7de4d04c10 am: dba7b2e967 am: 671a42e448 am: e18dc8954e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2585683

Change-Id: I125fd43bad61bdaccf373de2c3b7f57e1cf65a30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 09:14:08 +00:00
Treehugger Robot
dba7b2e967 Merge "Only search for test suite jdk files once" am: 6961b14269 am: e72f71968a am: 7de4d04c10 
Original change: https://android-review.googlesource.com/c/platform/build/+/2585683

Change-Id: I1dd51d6b64e045fa2a6a38432c70357cfec9539b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 07:49:20 +00:00
Treehugger Robot
e72f71968a Merge "Only search for test suite jdk files once" am: 6961b14269 
Original change: https://android-review.googlesource.com/c/platform/build/+/2585683

Change-Id: I8102ee297fbba527a6e997bc939681ec407e0b0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 06:23:53 +00:00
Cole Faust
a5f31a5820 Only search for test suite jdk files once 
compatibility.mk is included 33 times on aosp, and 47 times on
internal master. Each of these would run this shell command, and
there would be an entry in the kati stamp file for each time it was
run, causing this command to be run the 33/47 times every single build.
This took ~0.2 seconds, which can be saved by only running it once.
(However these ~0.2 seconds are parallelized with other parts of the
stamp checking)

Bug: 282079550
Test: m nothing
Change-Id: I364836d1cb0cc26ca9116eda6d954170e1cb7761
 2023-05-11 18:22:03 -07:00