StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,431 Commits 1 Branch 0 Tags
7b5284bf33449e3c5452d7708dea939ac6dd381f
Commit Graph

23431 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jooyung Han
7b5284bf33 Merge "apex: add apex_manifest.pb in file_contexts" am: dd85fd89b0 am: 5b811c02e2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1348942

Change-Id: I558889c69e09e79455b75c4399826fcaab9101fc
 2020-06-25 06:54:28 +00:00
Jooyung Han
5b811c02e2 Merge "apex: add apex_manifest.pb in file_contexts" am: dd85fd89b0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1348942

Change-Id: I1f7e1e6653665faa4cc7a8bc640b3a365a728a23
 2020-06-25 06:40:25 +00:00
Jooyung Han
dd85fd89b0 Merge "apex: add apex_manifest.pb in file_contexts" 2020-06-25 06:21:40 +00:00
Jooyung Han
fc2c927cb7 Merge "Check base property before using it" am: 83f107cdfb am: 85164317ab 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1345378

Change-Id: I3d59d49a51f6ec21cc6a642fee05f6a25cabd57d
 2020-06-25 03:48:00 +00:00
Jooyung Han
85164317ab Merge "Check base property before using it" am: 83f107cdfb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1345378

Change-Id: I12b2bf1485a4dc7fdb6664de15a422bf257152f1
 2020-06-25 03:31:18 +00:00
Jooyung Han
83f107cdfb Merge "Check base property before using it" 2020-06-25 03:13:16 +00:00
Treehugger Robot
ced31605c3 Merge "Only look for profiles when we have a profile dir" am: 0acb0fb2b7 am: 12db810dc7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1349324

Change-Id: Ie094b01dac1e3cc9f107977ca86d9627f1722dd7
 2020-06-25 01:47:43 +00:00
Jooyung Han
14135e4c26 Merge "apex/apk: enforce min_sdk_version of all deps" am: 14a08f5b28 am: afdc5239b8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1287253

Change-Id: I63074e39f5f319789920e55802d4f7934b556e0a
 2020-06-25 01:47:24 +00:00
Treehugger Robot
12db810dc7 Merge "Only look for profiles when we have a profile dir" am: 0acb0fb2b7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1349324

Change-Id: I1009cba45c59b01c8374f35d6885556b5b6e9635
 2020-06-25 01:35:52 +00:00
Jooyung Han
afdc5239b8 Merge "apex/apk: enforce min_sdk_version of all deps" am: 14a08f5b28 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1287253

Change-Id: Ibfaeb242fb32ed11735938091fe4cb8fb88b5370
 2020-06-25 01:35:43 +00:00
Treehugger Robot
0acb0fb2b7 Merge "Only look for profiles when we have a profile dir" 2020-06-25 01:28:52 +00:00
Jooyung Han
14a08f5b28 Merge "apex/apk: enforce min_sdk_version of all deps" 2020-06-25 01:18:52 +00:00
Jooyung Han
5c17ac003a Check base property before using it 
OverrideModule's `base` property should point a valid
module(OverridableModule).

It should be checked before using it.

Bug: 159503211
Test: add `override_apex` without `base`
      m emits error, not panic.
Change-Id: I1d7c9395cc9a7461e317dd4b6ddbec3a9e68e9bf
(cherry picked from commit 3851b0c1fe8e8ffd3d30b4b8a5289f39a2c98270)
 2020-06-25 09:17:59 +09:00
Dan Willemsen
78d51b00de Only look for profiles when we have a profile dir 
Right now, it's looking for *.prof files at the top of the source
directory.

For devices that don't specify the profile dir (everything on AOSP,
etc), this saves a couple percent of the globs that we check during
every build (and would re-execute if you add or remove files from the
top directory)

Bug: 159845846
Test: treehugger
Change-Id: I10d43422a2b5ae25e6557d435ecc89fe43536dd7
 2020-06-24 16:33:31 -07:00
David Srbecky
3a968ade8c Merge "Add SrcPath to InstallHookContext" am: 1bb4665c40 am: 5d0dfbf87b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1323754

Change-Id: I3a828c23ea633d1d1961845e3aff538daef3109d
 2020-06-24 23:27:03 +00:00
David Srbecky
5d0dfbf87b Merge "Add SrcPath to InstallHookContext" am: 1bb4665c40 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1323754

Change-Id: Idc4ff7bbacde07c81f119a8f1729e52d455ffafa
 2020-06-24 23:08:49 +00:00
David Srbecky
1bb4665c40 Merge "Add SrcPath to InstallHookContext" 2020-06-24 22:51:31 +00:00
Makoto Onuki
60d54a45f1 [automerger skipped] Merge "Enable check for "try to expose APIs from hidden class"" am: 35dfb01d86 am: 3772aa885b -s ours 
am skip reason: Change-Id I6ca2d8e3967cdc41aa2a931972472174aae2a613 with SHA-1 dbc0adad52 is in history

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

Change-Id: Ib56a256039c32e915bf23d1e79f35546d7a55015
 2020-06-24 22:44:01 +00:00
Makoto Onuki
3772aa885b Merge "Enable check for "try to expose APIs from hidden class"" am: 35dfb01d86 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1349323

Change-Id: If529bc7a9ee92f7c152cb88693554606e3953870
 2020-06-24 22:31:25 +00:00
Makoto Onuki
35dfb01d86 Merge "Enable check for "try to expose APIs from hidden class"" 2020-06-24 22:18:35 +00:00
Treehugger Robot
61a7d10b56 Merge "Minor tweaks to usage message." am: 6f61fa75c6 am: ac39c80b1a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1349042

Change-Id: I729e0eb8a0b7b3f54766e69c6fd4722a84495e19
 2020-06-24 20:26:46 +00:00
Treehugger Robot
ac39c80b1a Merge "Minor tweaks to usage message." am: 6f61fa75c6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1349042

Change-Id: I5134c63a3e6a328c92db71ba23011dac2f62bac3
 2020-06-24 20:13:13 +00:00
Treehugger Robot
6f61fa75c6 Merge "Minor tweaks to usage message." 2020-06-24 20:00:31 +00:00
Makoto Onuki
f51b7af2a4 Enable check for "try to expose APIs from hidden class" 
Exempt-From-Owner-Approval:Cherry-pick from goog/master
Bug: 159121253
Test: treehugger (i.e. this shouldn't trigger "API has changed" error.)
Merged-in: I6ca2d8e3967cdc41aa2a931972472174aae2a613
Change-Id: I6ca2d8e3967cdc41aa2a931972472174aae2a613
 2020-06-24 12:06:37 -07:00
Makoto Onuki
081afb5097 Merge "Enable check for "try to expose APIs from hidden class"" into rvc-dev-plus-aosp 2020-06-24 18:02:52 +00:00
Makoto Onuki
dbc0adad52 Enable check for "try to expose APIs from hidden class" 
Exempt-From-Owner-Approval:Cherry-pick from goog/master
Bug: 159121253
Test: treehugger (i.e. this shouldn't trigger "API has changed" error.)
Merged-in: I6ca2d8e3967cdc41aa2a931972472174aae2a613
Change-Id: I6ca2d8e3967cdc41aa2a931972472174aae2a613
 2020-06-24 18:02:14 +00:00
Thiébaud Weksteen
f6291dc72c Merge "Add standard rustfmt.toml" am: e6ec845501 am: 0b55059a13 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1345757

Change-Id: I0617631e9498e8e2a4273a792a2bb7270e31436f
 2020-06-24 17:37:13 +00:00
Jaewoong Jung
71bda880a6 [automerger skipped] Merge "Change how override_modules work with prebuilts." am: caec264ba9 am: 499a0ad831 -s ours 
am skip reason: Change-Id I96d24f1440ff8a8aa8b1253fc22fd532b5588339 with SHA-1 433ea2321a is in history

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

Change-Id: I48dda15e04508699a3299d4e51b444a4f80c880a
 2020-06-24 17:36:51 +00:00
Thiébaud Weksteen
0b55059a13 Merge "Add standard rustfmt.toml" am: e6ec845501 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1345757

Change-Id: I025a9c39d40e5736e80f566bb2608d5863fbee3f
 2020-06-24 17:27:38 +00:00
Thiébaud Weksteen
e6ec845501 Merge "Add standard rustfmt.toml" 2020-06-24 17:22:46 +00:00
Jaewoong Jung
499a0ad831 Merge "Change how override_modules work with prebuilts." am: caec264ba9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1347984

Change-Id: Ibbe4a2425a659f7df24539e30318c6efdef02738
 2020-06-24 17:18:41 +00:00
Jaewoong Jung
caec264ba9 Merge "Change how override_modules work with prebuilts." 2020-06-24 17:03:57 +00:00
Bob Badour
8970b45c8f Minor tweaks to usage message. 
Fix typo in tab separator example.
Add missing usage message to usage error.

Test: manually

Change-Id: I1d3a01fcb7caffeb39d6e47ddfe665059b2860f5
 2020-06-24 08:18:15 -07:00
Treehugger Robot
cdc27099b4 Merge "Include resources in sdk snapshot of java library impl" am: 29abfb7fd1 am: 742dfaa142 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1348682

Change-Id: I02456391e111a91721aa04be044f41f59e7d3183
 2020-06-24 14:46:26 +00:00
Treehugger Robot
742dfaa142 Merge "Include resources in sdk snapshot of java library impl" am: 29abfb7fd1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1348682

Change-Id: Id1a9545bfce9ed86cb2072bac58a8c410ca11c7c
 2020-06-24 14:36:24 +00:00
Treehugger Robot
29abfb7fd1 Merge "Include resources in sdk snapshot of java library impl" 2020-06-24 14:24:03 +00:00
Jooyung Han
580eb4fe38 apex: add apex_manifest.pb in file_contexts 
apex_manifest.pb is added to payload.img by the build system and is
supposed to be read by apexd during activation.

So, it should be labeled as "system_file" so that apexd can read it
regardless of how file_contexts is defined.

Bug: 159767275
Test: add an apex with file_contexts with everything as vendor_file
      apexd should activate the apex.
Change-Id: Ie34eb7ad905828976152d67a7dfabf0add0a5de4
 2020-06-24 23:00:32 +09:00
Paul Duffin
4e77284ab4 Include resources in sdk snapshot of java library impl 
Bug: 159607838
Test: m nothing
Change-Id: Ie7ddbffc3957f832abfadb27292c436e8e5dcbf3
 2020-06-24 13:04:15 +01:00
Jiyong Park
1b4929359a [automerger skipped] Merge "Don't remove entries for overriddable modules" am: c487ae15ba am: 9f7ffa1e6a -s ours 
am skip reason: Change-Id I85d0c756f862323bae556bf657d66ec50038985f with SHA-1 ac5e79f900 is in history

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

Change-Id: I340914517c65c1b3dde8da26fa84387b6bf00046
 2020-06-24 11:56:50 +00:00
Jiyong Park
9f7ffa1e6a Merge "Don't remove entries for overriddable modules" am: c487ae15ba 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1343378

Change-Id: I6712caf7a13b35a7173bf6cfe1a4cfdb34d0c95f
 2020-06-24 11:43:53 +00:00
Jiyong Park
c487ae15ba Merge "Don't remove entries for overriddable modules" 2020-06-24 11:33:39 +00:00
Christopher Ferris
45ba96ad76 Merge "Remove libc_scudo references." am: a5d1fab176 am: f25abb1d01 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326235

Change-Id: Ic6392dfe26e181d1cb12d2ceaee388ef268eeee3
 2020-06-24 03:44:12 +00:00
Christopher Ferris
f25abb1d01 Merge "Remove libc_scudo references." am: a5d1fab176 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326235

Change-Id: I9ce436ca9c2af9e6df2e280ec73253228f79652b
 2020-06-24 03:27:19 +00:00
Christopher Ferris
a5d1fab176 Merge "Remove libc_scudo references." 2020-06-24 03:16:48 +00:00
Jaewoong Jung
1e362dade7 Change how override_modules work with prebuilts. 
If an override module is overridden by a prebuilt, only skip its
installation instead of completely ignoring it, so that other modules
rely on it can still get configured and built properly.

Fixes: 159694118
Test: m checkbuild
Merged-In: I96d24f1440ff8a8aa8b1253fc22fd532b5588339
Change-Id: I96d24f1440ff8a8aa8b1253fc22fd532b5588339
 2020-06-23 17:50:13 -07:00
Colin Cross
36df26779c [automerger skipped] Merge changes Ie163a4da,I16375b88 into rvc-dev am: 16e8b0492d -s ours 
am skip reason: Change-Id Ie163a4dadd976e708f798855de73e58084931a91 with SHA-1 c31efeb25c is in history

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

Change-Id: I0b05c3a49a39b03c6dffb22d1af191b91cc29320
 2020-06-24 00:25:31 +00:00
Colin Cross
16e8b0492d Merge changes Ie163a4da,I16375b88 into rvc-dev 
* changes:
  Set root dir in lint project.xml
  Set ANDROID_SDK_HOME when running lint
 2020-06-24 00:14:23 +00:00
Liz Kammer
be48a6b355 Merge "Implement OutputFiles for python modules." am: ce3912fd4b am: 74a88dd404 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1346683

Change-Id: Id5f7168ff405e16c319f95bf423b74618b8ab3f6
 2020-06-24 00:04:56 +00:00
Liz Kammer
74a88dd404 Merge "Implement OutputFiles for python modules." am: ce3912fd4b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1346683

Change-Id: I6173ac4706321c6be0bd5159c99b41f5503655d4
 2020-06-23 23:53:16 +00:00
Liz Kammer
ce3912fd4b Merge "Implement OutputFiles for python modules." 2020-06-23 23:42:36 +00:00