StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,248 Commits 1 Branch 0 Tags
46b80660723c0015da09c93bac46ed5fac5063ea
Commit Graph

34248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Treehugger Robot
501085ce55 Merge "Refactor BazelTargetModule" am: 30899caf1f am: be2383b27d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1596752

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51942da3bee083dc396a544479dae695339966f7
 2021-02-24 01:48:46 +00:00
Paul Duffin
35ebfd328c Merge "Differentiate usages of word "include" in cc_sdk_test.go" am: d98f5b27e1 am: 9e21c8d376 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1599157

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64ff6dc5c9e6deab0b5d02d4ff578c0194a6d3b5
 2021-02-24 01:48:39 +00:00
Paul Duffin
4c5e855c2c Merge "Add sdk test for incorrect handling of generated headers" am: 8e46253840 am: ea8a9eb451 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1599156

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0755de61dacd4c995ffe02acc8a9f2c223eb081d
 2021-02-24 01:48:32 +00:00
Paul Duffin
75cd8d968a Merge "Separate versioned/unversioned testing in sdk/cc_sdk_test.go" am: d884c993dd am: 2e9d37bbe3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1599155

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7cafd7726a64f2453743c5bd70c9d15dd47b93a1
 2021-02-24 01:48:24 +00:00
Paul Duffin
51721deba9 Merge "Support testing versioned/unversioned sdk Android.bp files separately" am: 036e84a767 am: a89d47760c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1599154

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8276176d5379094f5987d7ab2e6b5d691f8a2ee9
 2021-02-24 01:30:04 +00:00
Treehugger Robot
be2383b27d Merge "Refactor BazelTargetModule" am: 30899caf1f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1596752

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58a0889f7f8b8897ce96358f1c957f0f6f83e15a
 2021-02-24 01:29:51 +00:00
Paul Duffin
9e21c8d376 Merge "Differentiate usages of word "include" in cc_sdk_test.go" am: d98f5b27e1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1599157

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie2b51edc425194294a2ababe3f57af8e376fab1b
 2021-02-24 01:29:08 +00:00
Paul Duffin
ea8a9eb451 Merge "Add sdk test for incorrect handling of generated headers" am: 8e46253840 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1599156

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia67fb6385d9fe2587afc0d4abebb5a16be415c56
 2021-02-24 01:28:58 +00:00
Paul Duffin
2e9d37bbe3 Merge "Separate versioned/unversioned testing in sdk/cc_sdk_test.go" am: d884c993dd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1599155

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id7de63a6f44460d5ef14e8b1f567e31a32b4592e
 2021-02-24 01:28:45 +00:00
Paul Duffin
a89d47760c Merge "Support testing versioned/unversioned sdk Android.bp files separately" am: 036e84a767 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1599154

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9af1fa93a5340c9b3ce19a2487e695f2a1aae034
 2021-02-24 01:27:57 +00:00
Paul Duffin
28a690d283 Merge "Only export sysprop headers in exported sysprop include directory" am: 1dd5764a4e am: e2db082638 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1596831

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I30281bbada936c510eea691b2d04ed33e71cbbe7
 2021-02-24 01:26:07 +00:00
Treehugger Robot
bda7188220 Merge "Export aidl, proto and sysprop generated headers separately" am: 2b22365c8c am: d9a7dc9b57 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1595276

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifdd660651dc8353cc3916ee58cd06e8cd4b61bce
 2021-02-24 01:25:47 +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
e2db082638 Merge "Only export sysprop headers in exported sysprop include directory" am: 1dd5764a4e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1596831

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b93e3245521ecac7f2c4b9178e6cfb1d30de821
 2021-02-24 01:20:12 +00:00
Treehugger Robot
d9a7dc9b57 Merge "Export aidl, proto and sysprop generated headers separately" am: 2b22365c8c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1595276

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie3dc56d6f0ba033a3d80655707c4acf81bccf8f2
 2021-02-24 00:49:28 +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
Treehugger Robot
30899caf1f Merge "Refactor BazelTargetModule" 2021-02-23 20:40:23 +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
Jeffrey Vander Stoep
baac1b3496 Merge "Setup ANDROID_RUST_VERSION env variable" am: 22af74eafd am: 0d2bc64075 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1597935

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib8f46ff8dbcddc8535961a15b8e19cdc4f769971
 2021-02-23 15:56:46 +00:00
Paul Duffin
d98f5b27e1 Merge "Differentiate usages of word "include" in cc_sdk_test.go" 2021-02-23 15:29:47 +00:00
Paul Duffin
8e46253840 Merge "Add sdk test for incorrect handling of generated headers" 2021-02-23 15:29:39 +00:00
Paul Duffin
d884c993dd Merge "Separate versioned/unversioned testing in sdk/cc_sdk_test.go" 2021-02-23 15:29:29 +00:00
Paul Duffin
036e84a767 Merge "Support testing versioned/unversioned sdk Android.bp files separately" 2021-02-23 15:29:20 +00:00
Paul Duffin
1dd5764a4e Merge "Only export sysprop headers in exported sysprop include directory" 2021-02-23 15:28:26 +00:00
Jeffrey Vander Stoep
0d2bc64075 Merge "Setup ANDROID_RUST_VERSION env variable" am: 22af74eafd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1597935

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7993b91eed86d0811f10c20dde09741e4394e22c
 2021-02-23 15:17:50 +00:00
Treehugger Robot
2b22365c8c Merge "Export aidl, proto and sysprop generated headers separately" 2021-02-23 14:11:24 +00:00
Liz Kammer
fc46bc1ee4 Refactor BazelTargetModule 
This eliminates the need to remove quotes, delete attributes, and
re-checking that name has correct prefix. Additionally, this allows
assignment directly to the BazelTargetModuleProperties struct, which
allows defaulting unused fields and clarity of which field is being set.

Test: go test soong tests
Test: ran ./build/bazel/scripts/milestone-2/demo.sh
Change-Id: Ia9bfcce76234c793a4ddd5f29a661150f83341c9
 2021-02-23 08:29:40 -05: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
Jeffrey Vander Stoep
22af74eafd Merge "Setup ANDROID_RUST_VERSION env variable" 2021-02-23 10:10:06 +00:00
TreeHugger Robot
99efe3bbf2 [automerger skipped] Merge "Merge ab/7061308 into stage." into stage-aosp-master am: 4191ec7529 -s ours 
am skip reason: Change-Id I4638ba660a8cc1748693224ac15e6aa6cad33646 with SHA-1 f6e4184684 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c74525aafdae3644d212958811d7f3c277ea2bd
 2021-02-23 09:05:07 +00:00
TreeHugger Robot
4191ec7529 Merge "Merge ab/7061308 into stage." into stage-aosp-master 2021-02-23 08:43:12 +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
Treehugger Robot
2cf358677b Merge "Fix infinite recursion when printing unrecognized linktype" am: f0f152484b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1600834

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6bf67cf22a8547fe9cabf7f4f2f54a7045cbf980
 2021-02-23 08:09:24 +00:00
Jingwen Chen
0b902be884 Merge "bp2build: Unexport GenerateBazelTargetsForDir." am: 0d2497088c am: 8bc5edc91d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1598094

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95aeb098eb9f2797f0fc05e3bfb328a38bc326ee
 2021-02-23 05:18:55 +00:00
Jingwen Chen
8bc5edc91d Merge "bp2build: Unexport GenerateBazelTargetsForDir." am: 0d2497088c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1598094

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib8991cb26dc54ad1e279baa420edb8d08b016ac9
 2021-02-23 04:34:13 +00:00
Treehugger Robot
f0f152484b Merge "Fix infinite recursion when printing unrecognized linktype" 2021-02-23 04:24:14 +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
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
Jingwen Chen
0d2497088c Merge "bp2build: Unexport GenerateBazelTargetsForDir." 2021-02-23 03:07:00 +00:00
Treehugger Robot
271bda1060 Merge "bootimg supports building (non-vendor) boot.img" am: 05785f0023 am: 79b58b3d11 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1594411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifbe453ed887abcbd997ed6a30d799d30b7bc4687
 2021-02-23 01:45:39 +00:00