StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,140 Commits 1 Branch 0 Tags
1a906a2ba985db30c2d32f958c58be5f305af34c
Commit Graph

53140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin Cross
1a906a2ba9 Prepend header jar for sharded javac compilation am: 3d56ed5605 am: 5336a09b91 am: 287985d4c4 am: 7e793651f5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1897430

Change-Id: I2fa30b976234021f8cc20c662d9470a7e4d4e889
 2021-11-20 02:46:18 +00:00
Colin Cross
de6cbce98f Merge "Revert "Move apex module installation into Soong"" am: 500bba1b20 am: d4ce0c64f5 am: 85d3c93a85 am: 834649db81 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1897971

Change-Id: I9551b9160616b509f7a3b609f3bf7f9530f13d94
 2021-11-20 02:45:58 +00:00
Yuntao Xu
eb033e5219 Merge "Revert^2 "Add seapp_contexts to allowlist of makefile goal"" am: ac69c239d1 am: 77bd4841a7 am: 76267be6fc am: e596da3246 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1897105

Change-Id: I7b415ef3a0527cf98ba6b20b1b7cb8edcca9564c
 2021-11-20 02:45:02 +00:00
Colin Cross
377f028841 Merge "Move apex module installation into Soong" am: 50f6f869a2 am: a3675380c6 am: 0cc52a39ba am: 0118e502de 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1896051

Change-Id: I312ee4233409590097b4461ded2cc6846fb15d03
 2021-11-20 02:44:38 +00:00
Colin Cross
7e793651f5 Prepend header jar for sharded javac compilation am: 3d56ed5605 am: 5336a09b91 am: 287985d4c4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1897430

Change-Id: I068a5dbc131d1c42554bfb8ea21ccd5b65b47509
 2021-11-20 02:32:37 +00:00
Colin Cross
834649db81 Merge "Revert "Move apex module installation into Soong"" am: 500bba1b20 am: d4ce0c64f5 am: 85d3c93a85 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1897971

Change-Id: Iad482471d6dc53582de85261e925a0eeb76994de
 2021-11-20 02:32:31 +00:00
Yuntao Xu
e596da3246 Merge "Revert^2 "Add seapp_contexts to allowlist of makefile goal"" am: ac69c239d1 am: 77bd4841a7 am: 76267be6fc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1897105

Change-Id: Iec3c699a590e06290ad0007d284ea68ff1d0d038
 2021-11-20 02:31:23 +00:00
Colin Cross
0118e502de Merge "Move apex module installation into Soong" am: 50f6f869a2 am: a3675380c6 am: 0cc52a39ba 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1896051

Change-Id: If58ac86d3782a768f4479d4179896ffa48427f20
 2021-11-20 02:31:09 +00:00
Colin Cross
287985d4c4 Prepend header jar for sharded javac compilation am: 3d56ed5605 am: 5336a09b91 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1897430

Change-Id: Ie9fd7ebd8d44bf9abecc220f93e0290dda46d104
 2021-11-20 02:16:12 +00:00
Colin Cross
85d3c93a85 Merge "Revert "Move apex module installation into Soong"" am: 500bba1b20 am: d4ce0c64f5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1897971

Change-Id: Idf51a940cc1da40da19a6bba1c5c7b8b1952d8b4
 2021-11-20 02:15:46 +00:00
Yuntao Xu
76267be6fc Merge "Revert^2 "Add seapp_contexts to allowlist of makefile goal"" am: ac69c239d1 am: 77bd4841a7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1897105

Change-Id: I3a07161cbaf37f00b975ade20f23c7f3bdbbe75f
 2021-11-20 02:15:18 +00:00
Colin Cross
0cc52a39ba Merge "Move apex module installation into Soong" am: 50f6f869a2 am: a3675380c6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1896051

Change-Id: I0ee4f3d90dfb6dca31aca303c1487c6c74d266d3
 2021-11-20 02:15:08 +00:00
Colin Cross
5336a09b91 Prepend header jar for sharded javac compilation am: 3d56ed5605 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1897430

Change-Id: Id8c71095d07439c3722dbf1585a3d18ea3b70f0f
 2021-11-20 00:09:45 +00:00
Colin Cross
d4ce0c64f5 Merge "Revert "Move apex module installation into Soong"" am: 500bba1b20 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1897971

Change-Id: Iab473c76d7ded6a20ce87584a18c396ca0c74ed5
 2021-11-20 00:09:28 +00:00
Yuntao Xu
77bd4841a7 Merge "Revert^2 "Add seapp_contexts to allowlist of makefile goal"" am: ac69c239d1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1897105

Change-Id: I1287df30c9214a5e327cd1a977bdcbcb39fa7827
 2021-11-20 00:08:48 +00:00
Colin Cross
a3675380c6 Merge "Move apex module installation into Soong" am: 50f6f869a2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1896051

Change-Id: I71788a834e4b97d3d1a812df70f570682ab8d6e2
 2021-11-20 00:08:26 +00:00
Colin Cross
3d56ed5605 Prepend header jar for sharded javac compilation 
When compiling without sharding javac will prefer classes built from
source over classes in the classpath.  Compiling with sharding puts
the header classes for all the sources onto the classpath, including
the sources that are not part of the current shard.  Emulate the
behavior when building without sharding by putting the header jar
first on the classpath so classes are resolved from the rest of
the sources before the real classpath.

Also switch to using the header jar without static libs dependencies
merged in, as those will already be present in the classpath.

Test: m framework-minus-apex
Test: m services.core
Test: TestSharding
Change-Id: Id11b39c15d89ce70da27d746a5c7e6b603c3c0f9
 2021-11-19 21:57:21 +00:00
Colin Cross
500bba1b20 Merge "Revert "Move apex module installation into Soong"" 2021-11-19 21:33:46 +00:00
Colin Cross
555c52491d Revert "Move apex module installation into Soong" 
This reverts commit 246e3eed67.

Reason for revert: broke aosp_bonito-userdebug build

Change-Id: Ib613f8f22532fe4588d3ec96aa001de869f8a633
 2021-11-19 21:32:54 +00:00
Yuntao Xu
ac69c239d1 Merge "Revert^2 "Add seapp_contexts to allowlist of makefile goal"" 2021-11-19 19:24:55 +00:00
Colin Cross
50f6f869a2 Merge "Move apex module installation into Soong" 2021-11-19 19:24:02 +00:00
Treehugger Robot
1eb3b8e4d2 Merge "A script to update the file contents with the command output." am: 71fe2cc783 am: ef9ba0896b am: 06eeaa24b9 am: e35897e7d8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1895960

Change-Id: Ia1dd4f0f61c64fa91400d9a19c6ac030b518b50c
 2021-11-19 04:13:16 +00:00
Treehugger Robot
e35897e7d8 Merge "A script to update the file contents with the command output." am: 71fe2cc783 am: ef9ba0896b am: 06eeaa24b9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1895960

Change-Id: Ife70e7739affaf5d00e3791251a3e9d285d6e25c
 2021-11-19 04:02:05 +00:00
Treehugger Robot
06eeaa24b9 Merge "A script to update the file contents with the command output." am: 71fe2cc783 am: ef9ba0896b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1895960

Change-Id: I5214c0c6e357886edf29e23c129b5e2b0d5aac4b
 2021-11-19 03:45:49 +00:00
Treehugger Robot
ef9ba0896b Merge "A script to update the file contents with the command output." am: 71fe2cc783 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1895960

Change-Id: Ifc8a2d07ba8af11e9f3540dbe2c2cd3a0ffe6d1a
 2021-11-19 03:32:12 +00:00
Colin Cross
ea52a9204c Merge changes from topic "app_set" am: 25f15a18e5 am: cf0dd40fb3 am: 80547efe96 am: 6bf007ed59 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1893517

Change-Id: Idd87ffac9012edc088dbc48cbea33241a591d128
 2021-11-19 03:31:26 +00:00
Colin Cross
6bf007ed59 Merge changes from topic "app_set" am: 25f15a18e5 am: cf0dd40fb3 am: 80547efe96 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1893517

Change-Id: I1a493deb2175d66150d50e741319df1cd9fa6c46
 2021-11-19 03:19:03 +00:00
Treehugger Robot
71fe2cc783 Merge "A script to update the file contents with the command output." 2021-11-19 03:12:12 +00:00
Colin Cross
80547efe96 Merge changes from topic "app_set" am: 25f15a18e5 am: cf0dd40fb3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1893517

Change-Id: I0348caf9bf02422c844a7d68cfd288f858deead5
 2021-11-19 02:58:27 +00:00
Colin Cross
cf0dd40fb3 Merge changes from topic "app_set" am: 25f15a18e5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1893517

Change-Id: I292481d4d1729e657c39283f0f0804ec77fce70a
 2021-11-19 02:33:56 +00:00
Colin Cross
25f15a18e5 Merge changes from topic "app_set" 
* changes:
  Install android_app_set modules in Soong
  Extract primary apk from apk set zip
 2021-11-19 02:18:20 +00:00
Treehugger Robot
d10f73373a Merge changes from topics "dist_for_goals", "mk2star" am: f18bedf1c3 am: 327d49367c am: 206f6343d1 am: 8328b1debb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1890800

Change-Id: I2d4c4078cf1c1e6bd7948dde6d2ac2291d0a93dd
 2021-11-18 23:22:45 +00:00
Sasha Smundak
cec58ecfed Convert dist-for-goals. am: d679785d0d am: b328bbf7ca am: f5ef269d74 am: eb0350eff9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1892884

Change-Id: I5f31a5e5563200c1a009ec6fa88765bb8fdb9b59
 2021-11-18 23:22:43 +00:00
Sasha Smundak
82b6e8483c A script to update the file contents with the command output. 
Used to avoid rerunning Ninja files regeneration if m2rbc conversion
generated the same makefile.

Test: treehugger
Change-Id: I1b0a619f961e6d2c7bf99a48053ecb58147c6db0
 2021-11-18 15:15:45 -08:00
Treehugger Robot
8328b1debb Merge changes from topics "dist_for_goals", "mk2star" am: f18bedf1c3 am: 327d49367c am: 206f6343d1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1890800

Change-Id: Idf0463bc8e21ab42cb8b9abfaeec10d386ea6d70
 2021-11-18 23:04:00 +00:00
Sasha Smundak
eb0350eff9 Convert dist-for-goals. am: d679785d0d am: b328bbf7ca am: f5ef269d74 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1892884

Change-Id: Ib51c3ac863624b79221527ee3ec9cf87357f6e74
 2021-11-18 23:03:57 +00:00
Treehugger Robot
a3d1755aab Merge "Simplify equality expressions when comparing to "true"" am: 7868f6818e am: 55819bf0ca am: e68a4d72d4 am: 5b1e43e678 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1894635

Change-Id: I5075ef9109719b45f9a52c942047243c0b789def
 2021-11-18 22:53:43 +00:00
Treehugger Robot
206f6343d1 Merge changes from topics "dist_for_goals", "mk2star" am: f18bedf1c3 am: 327d49367c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1890800

Change-Id: Ibe9a0a974fd4ac14d0c4fa1d13a3dc0574fb3e4e
 2021-11-18 22:46:47 +00:00
Sasha Smundak
f5ef269d74 Convert dist-for-goals. am: d679785d0d am: b328bbf7ca 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1892884

Change-Id: Idc44fb7c7e1a1e2b2010c70b20f255fef451a687
 2021-11-18 22:46:45 +00:00
Treehugger Robot
5b1e43e678 Merge "Simplify equality expressions when comparing to "true"" am: 7868f6818e am: 55819bf0ca am: e68a4d72d4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1894635

Change-Id: I1f0181dba4982efa67c4d8943e621440c2c5ba8d
 2021-11-18 22:34:29 +00:00
Yuntao Xu
feb0756d41 Revert^2 "Add seapp_contexts to allowlist of makefile goal" 
e87a81673e

Change-Id: I461f3ecdd0b0ea0a4b7b12531cf8b561e170df55
 2021-11-18 22:33:02 +00:00
Treehugger Robot
327d49367c Merge changes from topics "dist_for_goals", "mk2star" am: f18bedf1c3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1890800

Change-Id: I037ac23b7df5461c2a34eb1352d8fe2126c98d9c
 2021-11-18 22:23:51 +00:00
Sasha Smundak
b328bbf7ca Convert dist-for-goals. am: d679785d0d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1892884

Change-Id: Ic7049839161fa017e951e888fa18fdc4db871594
 2021-11-18 22:23:49 +00:00
Treehugger Robot
e68a4d72d4 Merge "Simplify equality expressions when comparing to "true"" am: 7868f6818e am: 55819bf0ca 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1894635

Change-Id: Ie78cc7277f579f0258445266130a4137a118852a
 2021-11-18 22:10:28 +00:00
Treehugger Robot
f18bedf1c3 Merge changes from topics "dist_for_goals", "mk2star" 
* changes:
  Generate runtime conversion diagnostics
  Convert dist-for-goals.
 2021-11-18 22:04:52 +00:00
Treehugger Robot
55819bf0ca Merge "Simplify equality expressions when comparing to "true"" am: 7868f6818e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1894635

Change-Id: Ie6c9deda6d329c77786533475477d47dbd8281c8
 2021-11-18 21:52:58 +00:00
Colin Cross
246e3eed67 Move apex module installation into Soong 
Move apex module installation rules into Soong by overriding
InstallBypassMake.

Soong installs don't support post install commands, so move the
symlinks into separate rules and add dependencies on them.

This relands If65d283abc86f18ad266da0bf16fe95971a0bf9c with fixes
to install files into $OUT/apex.

Bug: 204136549
Test: m checkbuild
Change-Id: I606286e971b55d9d1fc4dcd0fbd476962de5fa79
 2021-11-18 13:13:44 -08:00
Treehugger Robot
7868f6818e Merge "Simplify equality expressions when comparing to "true"" 2021-11-18 21:11:17 +00:00
Vova Sharaienko
be307f9361 Merge "Revert "Add seapp_contexts to allowlist of makefile goal"" am: 030878a492 am: fca78780d4 am: 547a9f5059 am: 9f04bd0642 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1896452

Change-Id: I58886b6ed645330a6408e020dda1bf2a5dea6fc7
 2021-11-18 19:15:47 +00:00
Vova Sharaienko
9f04bd0642 Merge "Revert "Add seapp_contexts to allowlist of makefile goal"" am: 030878a492 am: fca78780d4 am: 547a9f5059 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1896452

Change-Id: I382cee7ad387d5429f8a6936a12f37e7b44c3a5e
 2021-11-18 18:57:11 +00:00