StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,279 Commits 1 Branch 0 Tags
2dcfbcbccfd3859f68d46d1662f289c5264bbf9c
Commit Graph

3847 Commits

Author SHA1 Message Date
Treehugger Robot
2dcfbcbccf Merge "Propagate java resources in apps with no code" am: 2ee47272f5 am: f6316c4b1c am: 5541754e5a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1610973

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic0bcc631c3927ef7cbfeaba4e44435eaf41f74c5
 2021-03-01 09:00:18 +00:00
Treehugger Robot
5541754e5a Merge "Propagate java resources in apps with no code" am: 2ee47272f5 am: f6316c4b1c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1610973

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9f21c21508658da4cad91202315e3589b939c7f
 2021-02-28 02:09:14 +00:00
Colin Cross
b014f0787e Propagate java resources in apps with no code 
Use the java resources jar as the dex jar when building apps that
have no code.

Also remove maybeStrippedDexJar, the dex jar is never stripped now.

Fixes: 176305357
Test: TestAppJavaResources
Change-Id: Ic8b1165bd35d71237d307e7f5f895764e203a10d
 2021-02-26 16:28:12 -08:00
Jaewoong Jung
098080d812 Merge "Fix the releax_check flag format verb." am: fc3bfe54c3 am: cfeffdc6ec am: f4f0d09eb8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1607177

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11407e6152ec04a58cfa9c857bbf7361b43de4cc
 2021-02-25 17:49:15 +00:00
Jaewoong Jung
f4f0d09eb8 Merge "Fix the releax_check flag format verb." am: fc3bfe54c3 am: cfeffdc6ec 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1607177

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If52ad78efd887f1a5221fd8feee7a4d448b1e75d
 2021-02-25 16:50:59 +00:00
Jaewoong Jung
8431282af4 Fix the releax_check flag format verb. 
%b prints base 2 numbers. %t is the right one to use for booleans.

Test: TreeHugger
Change-Id: Ifbae0170ba03583182ae848bcfc6bb104f1be7e0
 2021-02-24 21:09:10 -08:00
Paul Duffin
1ffd60ae5d Merge "Allow pre-singleton types to be registered in RegistrationContext" am: ebbf33c42b am: de8121e465 am: ea4ad11547 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1605033

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I65bc9e2477dd09b894bef083a857b560376b3090
 2021-02-24 23:00:14 +00:00
Paul Duffin
ea4ad11547 Merge "Allow pre-singleton types to be registered in RegistrationContext" am: ebbf33c42b am: de8121e465 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1605033

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8e4a06b96a9754be64cc423b8ac46ceeed461177
 2021-02-24 21:51:46 +00:00
Paul Duffin
eafc16bf14 Allow pre-singleton types to be registered in RegistrationContext 
Bug: 181070625
Test: m droid
Change-Id: I708b78ed0b42ec55b0442307f40531cfe1233c2b
 2021-02-24 10:17:19 +00:00
Christoffer Quist Adamsen
41b5abff57 Merge "Allow missing classes in R8 builds" am: a72571f0d1 am: c3ae5578c9 am: 561178ba14 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1597934

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I568e60d6f00e0a8412defba0f33dcd11c5022c73
 2021-02-24 09:48:55 +00:00
Christoffer Quist Adamsen
561178ba14 Merge "Allow missing classes in R8 builds" am: a72571f0d1 am: c3ae5578c9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1597934

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib9679603b87f3bae63fd2e6441b2e55532152148
 2021-02-24 08:55:10 +00:00
Christoffer Quist Adamsen
a72571f0d1 Merge "Allow missing classes in R8 builds" 2021-02-24 07:25:18 +00:00
Treehugger Robot
a1b4312a83 Merge "Update soong copy of java binaries when Make copy is installed" am: 9a4279309f am: 5ee786ff3f am: 46b8066072 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1602454

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0af6672a1fdfa6e047aca5f9448df1a6f2409a9e
 2021-02-24 02:20:50 +00:00
Treehugger Robot
26eb5589c5 Merge "Add non-fatal mode for verify_uses_libraries check." am: 7eacdbf8a6 am: d078b18f64 am: 04246701f7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1592411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83de49fc2d4a71f5bce763f66dc23c55b594a1ad
 2021-02-24 02:20:42 +00:00
Paul Duffin
85fe4e5597 Merge changes from topic "hiddenapi_additional_annotations" am: ece454400d am: 7b9e857f9f am: 07a776ea1f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1590193

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5262eaa5c61a9e1c97ba0af188f86904729344a6
 2021-02-24 02:15:15 +00:00
Paul Duffin
7af5f9f81c Remove duplicates in monolithic hidden API files am: 82b3fcf123 am: f36d0e21c3 am: 2232ee00c0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1587496

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5aae104ce5ac4d138bd23a5d90b5a7c01ad7a9e6
 2021-02-24 02:15:11 +00:00
Paul Duffin
db4a480d94 Remove implicit dependency from <x> -> <x>-hiddenapi am: f8f4af8f1a am: 44091b4387 am: 0b27470f71 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1587495

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ae905cd1c65417d7313c21dab1483749535f9fe
 2021-02-24 02:15:06 +00:00
Treehugger Robot
46b8066072 Merge "Update soong copy of java binaries when Make copy is installed" am: 9a4279309f am: 5ee786ff3f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1602454

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I73bd8e457459661e5dffafef1a4cb6014fd85298
 2021-02-24 01:49:19 +00:00
Treehugger Robot
04246701f7 Merge "Add non-fatal mode for verify_uses_libraries check." am: 7eacdbf8a6 am: d078b18f64 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1592411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iabb151ce223f538a346140d8cd78cb0f9c5b6234
 2021-02-24 01:49:10 +00:00
Paul Duffin
07a776ea1f Merge changes from topic "hiddenapi_additional_annotations" am: ece454400d am: 7b9e857f9f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1590193

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6a1c0937a2cfcda928c11cacd442fb4e435945c0
 2021-02-24 01:24:29 +00:00
Paul Duffin
2232ee00c0 Remove duplicates in monolithic hidden API files am: 82b3fcf123 am: f36d0e21c3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1587496

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I40e1bc0c070332a3a02035962d00294d01a43028
 2021-02-24 01:24:26 +00:00
Paul Duffin
0b27470f71 Remove implicit dependency from <x> -> <x>-hiddenapi am: f8f4af8f1a am: 44091b4387 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1587495

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc49adf73da7a01a7c848b539a4eadfc9186f67d
 2021-02-24 01:24:21 +00:00
Paul Duffin
f36d0e21c3 Remove duplicates in monolithic hidden API files am: 82b3fcf123 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1587496

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b6bbc33ff1bae69ca09dafafa4c65690451b5b9
 2021-02-24 00:49:24 +00:00
Paul Duffin
44091b4387 Remove implicit dependency from <x> -> <x>-hiddenapi am: f8f4af8f1a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1587495

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f701167d78771a53ab6e0f082a12c44871d22ec
 2021-02-24 00:48:45 +00:00
Treehugger Robot
9a4279309f Merge "Update soong copy of java binaries when Make copy is installed" 2021-02-23 21:35:20 +00:00
Treehugger Robot
7eacdbf8a6 Merge "Add non-fatal mode for verify_uses_libraries check." 2021-02-23 20:45:42 +00:00
Colin Cross
44b85d01c9 Update soong copy of java binaries when Make copy is installed 
m <modulename> is handled by Make and installs the Make copy of a host
java binary in out/host/linux-x86/bin, and doesn't depend on the Soong
copy in out/soong/host/linux-x86/bin.  That can leave a stale binary
in the Soong directory, and since the Soong directory is first in the
path set up by envsetup.sh, can result in confusing behavior to end
users.

cc_binary already has the Make binary depend on the Soong binary
so that they are both updated.  Do the same for java_binary.

Fixes: 180405155
Test: m metalava
Change-Id: Ic84a131a2851cc4a18ce3725da3c4067137d6120
 2021-02-23 11:19:57 -08:00
Paul Duffin
ece454400d Merge changes from topic "hiddenapi_additional_annotations" 
* changes:
  Sort hiddenapi monolithic files by signature
  Remove duplicates in monolithic hidden API files
  Remove implicit dependency from <x> -> <x>-hiddenapi
 2021-02-23 12:48:24 +00:00
Treehugger Robot
f41b2ab648 Merge "Fix infinite recursion when printing unrecognized linktype" am: f0f152484b am: 2cf358677b am: 98f5b4b6e0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1600834

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53ea29450f59496f10a896d3712a32c044102efe
 2021-02-23 10:22:29 +00:00
Treehugger Robot
98f5b4b6e0 Merge "Fix infinite recursion when printing unrecognized linktype" am: f0f152484b am: 2cf358677b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1600834

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d51880f8ccdbbdc5f281e182f987f543b4b3ed2
 2021-02-23 08:42:44 +00:00
Colin Cross
24bdd3ae4f Merge "Add ArcSettings and SettingsGoogle to the legacy allowlist" into rvc-qpr-dev-plus-aosp 2021-02-23 04:12:51 +00:00
Colin Cross
e8c07c5c54 Merge changes from topic "SettingsGoogle-bp-rvc-qpr-dev-plus-aosp" into sc-dev 
* changes:
  Add ArcSettings and SettingsGoogle to the legacy allowlist 2p: fdc78fd88d
  Add ArcSettings and SettingsGoogle to the legacy allowlist
 2021-02-23 04:12:51 +00:00
Jiyong Park
d4cbf34032 Fix infinite recursion when printing unrecognized linktype 
Bug: N/A
Test: remove some cases from String() so that some linktypes go to the
default path. Then run m nothing. No infinite recursion. Error is
correctly shown.
PANIC=String method: unrecognized linktype: 5
Change-Id: I424755bc89871fc2144ff22d6391f57157cd434d

Change-Id: Ice791025dc50f44ffabd1050bafc5ea35023d32c
 2021-02-23 04:02:23 +00:00
Treehugger Robot
d1abafe830 Merge "Limit the number of the Java source files in a single compilation unit" am: a61a042fa6 am: 3e97f39674 am: 398253b55c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1590694

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If636ff3863b1b81256abd20bd139160bfd56aedc
 2021-02-23 02:21:19 +00:00
Treehugger Robot
173eeb8ca0 Merge "Add ctx to AndroidMkExtraEntriesFunc" am: 277303f042 am: 5b72de988f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1360943

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I90ae8f53df60dd6bdbc9ae040c44a28a334017e3
 2021-02-23 01:45:26 +00:00
Treehugger Robot
398253b55c Merge "Limit the number of the Java source files in a single compilation unit" am: a61a042fa6 am: 3e97f39674 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1590694

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I887bfca8ce13ced6aa4005afa97a8c7e425716b4
 2021-02-23 01:45:06 +00:00
Treehugger Robot
277303f042 Merge "Add ctx to AndroidMkExtraEntriesFunc" 2021-02-22 22:40:31 +00:00
Presubmit Automerger Backend
342efcad1c Add ArcSettings and SettingsGoogle to the legacy allowlist 2p: fdc78fd88d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13630298

Change-Id: I64e8a715538f8515254368ec427bdb6cb1ff996d
 2021-02-22 21:44:32 +00:00
Treehugger Robot
a61a042fa6 Merge "Limit the number of the Java source files in a single compilation unit" 2021-02-22 19:54:00 +00:00
Ulya Trafimovich
8c35fcf4d5 Add non-fatal mode for verify_uses_libraries check. 
The new mode is enabled with environment variable
RELAX_USES_LIBRARY_CHECK. If the variable is set to true, then a
verify_uses_libraries check failure does not fail the build, instead it
sets a special compiler filter "extract" for dexpreopt, which means that
the DEX file will be extracted, but it won't be compiled to native code.
Class loader context will be set to empty in this case (not &, as it is
going to be deprecated soon).

If the variable RELAX_USES_LIBRARY_CHECK is unset or set to something
other than "true", then the old behaviour of the verify_uses_libraries
check is preserved.

The intended use case for this flag is to have a smoother migration path
for the Java modules that need to add <uses-library> information in
the build files. The flag allows to quickly silence build errors. This
flag should be used with caution and only as a temporary measure, as it
masks real errors and affects performance.

verify_uses_libraries check is reworked so that it writes the error
message to a status file (which is used instead of the former timestamp
file). Currently the stored error message is not used, but it may be
used later to produce a warning. Dexpreopt command checks if the status
file exists and is nonempty; if that is the case, then compiler filter
is set to "extract".
Bug: 132357300

Test: Manually add some mismatch between the libraries in the Android.bp
      and Android.mk files for dexpreopted apps, build with
      RELAX_USES_LIBRARY_CHECK=true and obsserve that the build doesn't
      fail and they are compiled with compiler-filter "extract".
      Unset RELAX_USES_LIBRARY_CHECK and observe that the build fails.

Change-Id: Ibb5d993a25b1df1d2e70b7d5aafc6997f9d64e67
 2021-02-22 15:41:03 +00:00
Christoffer Quist Adamsen
e850737ee4 Allow missing classes in R8 builds 
Bug: 180878971
Bug: 72683872
Test: TARGET_PRODUCT=aosp_arm64 m -j core-oj
Change-Id: I663220567eb8f034d3efccc60228aef91c716e8e
 2021-02-22 12:09:01 +00:00
Treehugger Robot
c5b87bdc4b Merge "Remove EnforceRROExemptedTargets" am: f0a869847a am: 7a7c1491c4 am: a9cf772572 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1596231

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I61fd5f110aefd4f3ba2b79219f40a66251464117
 2021-02-20 04:07:41 +00:00
Treehugger Robot
a9cf772572 Merge "Remove EnforceRROExemptedTargets" am: f0a869847a am: 7a7c1491c4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1596231

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic7fc17dd2f173a1e28509012b4eb7c8bc3872c43
 2021-02-20 03:24:59 +00:00
Treehugger Robot
f0a869847a Merge "Remove EnforceRROExemptedTargets" 2021-02-20 01:47:43 +00:00
Colin Cross
aa2555387d Add ctx to AndroidMkExtraEntriesFunc 
Add a ctx parameter to AndroidMkExtraEntriesFunc to allow them to
access providers.

Test: m checkbuild
Change-Id: Id6becc1e425c3c3d8519248f8c0ce80777fac7cc
Merged-In: Id6becc1e425c3c3d8519248f8c0ce80777fac7cc
 2021-02-19 23:05:40 +00:00
Colin Cross
fdc78fd88d Add ArcSettings and SettingsGoogle to the legacy allowlist 
Settings-core is already in the allowlist, ArcSettings and
SettingsGoogle need to compile the same source files but were
in Android.mk files.  Add them to the allowlist so they can
be converted to Android.bp.

This relands I73bef76ecc517223827ac6f3cb1f0624c738fb9d.

Bug: 175124789
Change-Id: I6e116b5d4574990c8513371bbbb5175f2516c98f
Test: m RunSettingsGoogleRoboTests RunArcSettingsRoboTests
 2021-02-19 19:18:41 +00:00
Jeongik Cha
cee5ba973d Remove EnforceRROExemptedTargets 
There is no more target relying on EnforceRROExemptedTargets

Bug: 150820813
Test: m
Change-Id: If50d22c0e4f99e8c50d6a30cb94a0c3a5646b6fa
 2021-02-19 12:16:12 +09:00
TreeHugger Robot
bd72625520 Merge "Add ctx to AndroidMkExtraEntriesFunc" into sc-dev 2021-02-19 01:03:10 +00:00
Pedro Loureiro
c14cf5825c Merge "Add support for lint baseline files" am: 8a75058d3f am: 85c97f861a am: 2464363376 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1589498

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7cb9ba83444af9df321adb9b8b16adeb2157a67e
 2021-02-18 17:13:34 +00:00
Pedro Loureiro
2464363376 Merge "Add support for lint baseline files" am: 8a75058d3f am: 85c97f861a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1589498

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a43fdd2881f47d00611e9cf5c145100d996e135
 2021-02-18 16:52:26 +00:00