StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,995 Commits 1 Branch 0 Tags
7c9e60e17cf22a417d08b9ba3078fecdadfa7522
Commit Graph

33995 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Hansson
7c9e60e17c Merge "Fix api_fingerprint.txt generation" am: 404adeefdc am: c0777462c5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1581731

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia43c021f7af85264ae738b42cef5047419471ce1
 2021-02-15 12:33:21 +00:00
Anton Hansson
c0777462c5 Merge "Fix api_fingerprint.txt generation" am: 404adeefdc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1581731

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied96fa5c9dcb848d1c9087a888907b263a4afbf7
 2021-02-15 12:04:41 +00:00
Anton Hansson
404adeefdc Merge "Fix api_fingerprint.txt generation" 2021-02-15 11:31:37 +00:00
Ivan Lozano
9d1612d44c Merge "rust: Emit android vndk cfg flag." am: 36eb24b3ab am: e319ba80ef 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1587391

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8edf442f3ca8f26dc76edf5f0a9740ab8c697901
 2021-02-14 18:09:01 +00:00
Ivan Lozano
e319ba80ef Merge "rust: Emit android vndk cfg flag." am: 36eb24b3ab 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1587391

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1039578fbc28e41fe49359900b0a43150c917ccd
 2021-02-14 17:00:47 +00:00
Ivan Lozano
36eb24b3ab Merge "rust: Emit android vndk cfg flag." 2021-02-14 16:20:46 +00:00
Colin Cross
e34846731c Merge "Convert java.Dependency to JavaInfo provider" am: b87f4b4cab am: d8e4a38924 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1581950

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ff7cb15041e62bd04bfba91706fce1940f528af
 2021-02-13 01:32:27 +00:00
Colin Cross
d8e4a38924 Merge "Convert java.Dependency to JavaInfo provider" am: b87f4b4cab 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1581950

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa0dbf607e0d2ff9282106c03621aade31ba6df3
 2021-02-13 01:04:56 +00:00
Colin Cross
b87f4b4cab Merge "Convert java.Dependency to JavaInfo provider" 2021-02-13 00:39:24 +00:00
Ivan Lozano
f76cdf7c20 rust: Emit android vndk cfg flag. 
Pass an "android_vndk" cfg flag that indicates this code
targets the vndk. This can be useful in instances where code
might need to behave differently.

This also includes a fix to make sure our vendor Soong tests
are correctly configured.

Bug: 179907868
Test: Soong tests pass.
Test: Example module emits new cfg flags.
Change-Id: I01cdf91f6f9d42cd8a759266d5170479664bf4bc
 2021-02-12 12:17:50 -05:00
Paul Duffin
37f1591a5e Merge changes I831da5fa,I866916c9 am: c66769ddd9 am: 53606f14c3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1579441

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib789cc734436bdbe03aa476f4021f785ee2559c9
 2021-02-12 11:13:03 +00:00
Ulyana Trafimovich
a166d44faa Merge "Preserve <uses-library> order in dexpreopt.config files." am: da68a045a3 am: 35bc2b0ec9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1584966

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0b2cd6f1970a817ebcffa42172e985e1641cd60
 2021-02-12 11:00:38 +00:00
Paul Duffin
53606f14c3 Merge changes I831da5fa,I866916c9 am: c66769ddd9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1579441

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icae891ef2e16df3db3ac4c4d9f670cda89c5cc57
 2021-02-12 10:51:38 +00:00
Ulyana Trafimovich
35bc2b0ec9 Merge "Preserve <uses-library> order in dexpreopt.config files." am: da68a045a3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1584966

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3fc1b2b35734117e5a80d65fa39c61e99b809ef4
 2021-02-12 10:50:48 +00:00
Paul Duffin
c66769ddd9 Merge changes I831da5fa,I866916c9 
* changes:
  Move logic for selecting the primary module into initHiddenAPI()
  Ensure that <x>-hiddenapi modules are included in hiddenapi-index.csv
 2021-02-12 10:28:28 +00:00
Ulyana Trafimovich
da68a045a3 Merge "Preserve <uses-library> order in dexpreopt.config files." 2021-02-12 10:22:39 +00:00
Eric Holk
560593e209 Add statsd exports to be consumed by unbundled modules am: 7529f06707 am: 442baf1b3d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1584325

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0ce728eb413f1fe243cfe2a772a7d021aa628e03
 2021-02-12 02:20:59 +00:00
Eric Holk
442baf1b3d Add statsd exports to be consumed by unbundled modules am: 7529f06707 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1584325

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a7ff0c17fd33319ec16ac959b45c59d40c2dee1
 2021-02-12 01:44:59 +00:00
Ivan Lozano
28b2c1d879 Merge "rust: Use prebuilts for x86 host target." am: 05ad76b459 am: 4c4815d7c1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1581843

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icd36403807e60a1be0023201d738cfd2a6a855a2
 2021-02-11 19:30:47 +00:00
Eric Holk
7529f06707 Add statsd exports to be consumed by unbundled modules 
This is needed first for ART to enable statsd metrics reporting, but
this will be needed by more modules as they become unbundled.

Test: build-mainline-modules.sh
Bug: 178500083
Change-Id: I5af0b8db7a24c86ffd3f34732ac747a4fc6a7a55
 2021-02-11 19:02:40 +00:00
Ivan Lozano
4c4815d7c1 Merge "rust: Use prebuilts for x86 host target." am: 05ad76b459 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1581843

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I78ff4ea594310b5d7085fcad66af761d61c41cde
 2021-02-11 17:57:55 +00:00
Ivan Lozano
05ad76b459 Merge "rust: Use prebuilts for x86 host target." 2021-02-11 17:39:11 +00:00
Ulya Trafimovich
65556a87d3 Preserve <uses-library> order in dexpreopt.config files. 
Library order is important because it is used to construct class loader
context, which is then written into OAT/ODEX files and chacked against
class loader context constructed by PackageManager on the device. If the
orders are different, dexpreopted code is rejected.

Soong avoids using Go maps for class loader context representation
precisely for that reason. However, for the modules defined in makefiles
dexpreopt configs were serialized to JSON and unmarshaled to Go maps,
which resulted in wrong order of libraries. This CL changes Go
representation of class loader contexts imported from JSON and makes the
order stable.

Bug: 132357300
Test: lunch cf_x86_64_phone-userdebug && m && launch_cvd \
      adb wait-for-device && adb root && adb logcat \
      | grep -E 'ClassLoaderContext [a-z ]+ mismatch'
      # empty grep output, no errors
Change-Id: I15f51617f9573c0bbcb324cf2592daf719cad586
 2021-02-11 16:58:51 +00:00
Paul Duffin
f75e527c2b Move logic for selecting the primary module into initHiddenAPI() 
Bug: 178361284
Test: m droid
      Verified that hiddenapi files (both aggregated ones and for the
      individual modules) are not affected by this change.
      Also verified that the hiddenapi files created when using the
      prebuilts (using SOONG_CONFIG_art_module_source_build=false) are
      the same as when using the source. There is a slight difference
      in the order but otherwise identical.
Change-Id: I831da5fa41eb7668b07bbdc4dd08ec2cdb8803d0
 2021-02-11 15:43:28 +00:00
Paul Duffin
e7975ff77c Ensure that <x>-hiddenapi modules are included in hiddenapi-index.csv 
Adds a test that makes sure that <x>-hiddenapi modules that provide
additional annotations for the <x> boot jar module are included when
generating the hiddenapi-index.csv file.

Bug: 178361284
Test: m nothing
Change-Id: I866916c9275af17954e0634347d183228d4ddc17
 2021-02-11 15:43:28 +00:00
Anton Hansson
973d31c757 Fix api_fingerprint.txt generation 
Use the generated txt files as input instead
of globbing for now non-existent files.

Also add the system server api txt to the hash.

Bug: 179807354
Test: verify out/soong/api_fingerprint.txt changes now
Test: verify the command in the ninja file looks ok:
      grep api_fingerprint out/soong/build.ninja
Change-Id: I7a49ca134eb93b22537a4f3054285eb15f8c4256
 2021-02-11 09:17:10 +00:00
Lev Proleev
645c630372 Merge "Add NNAPI AIDL interface to allowed deps" am: 56ca4e4706 am: 3cd706324f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1579440

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I65714886e2db1a5b97af16144813c00df8ab18c7
 2021-02-10 18:02:18 +00:00
Lev Proleev
3cd706324f Merge "Add NNAPI AIDL interface to allowed deps" am: 56ca4e4706 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1579440

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie4da671f20f3fd1209468cba9aa9b0110cbf2506
 2021-02-10 17:09:00 +00:00
Lev Proleev
56ca4e4706 Merge "Add NNAPI AIDL interface to allowed deps" 2021-02-10 16:45:19 +00:00
Treehugger Robot
66a854d585 Merge "Add LOCAL_LICENSE_KINDS to build/soong" am: b68036f44b am: 0a1087f291 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1575543

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I17bbc2d510465587580cf26e55e4f65a952e198c
 2021-02-10 08:30:03 +00:00
Treehugger Robot
0a1087f291 Merge "Add LOCAL_LICENSE_KINDS to build/soong" am: b68036f44b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1575543

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If59098de6ca2cb7767ebf84e6e994f8e458336ba
 2021-02-10 08:02:07 +00:00
Treehugger Robot
b68036f44b Merge "Add LOCAL_LICENSE_KINDS to build/soong" 2021-02-10 07:18:29 +00:00
Bob Badour
954cb01b1c Merge "Change WTFPL and BeerWare to notice per recent change." am: c6226d668e am: 1e7c3be48a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1570963

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibff0733195609dca5c08d20de123d44faf0d9861
 2021-02-10 04:52:45 +00:00
TreeHugger Robot
a0f3390d25 Merge "Fix broken build" into stage-aosp-master am: 6caae707ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13538311

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a0644dde6b80fee76f3943bdeba4603ed3b0c40
 2021-02-10 04:52:21 +00:00
Bob Badour
1e7c3be48a Merge "Change WTFPL and BeerWare to notice per recent change." am: c6226d668e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1570963

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I602a7f46ae22d320888d2b891795c4cd8de4a3fe
 2021-02-10 04:27:18 +00:00
TreeHugger Robot
6caae707ee Merge "Fix broken build" into stage-aosp-master 2021-02-10 04:14:24 +00:00
Bob Badour
c6226d668e Merge "Change WTFPL and BeerWare to notice per recent change." 2021-02-10 03:44:26 +00:00
Bob Badour
1ceaa1295c Merge "Allow cross-cutting dependencies like licenses." am: a3348295d4 am: c54c5770db 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1579112

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I684cfc27181c698d877be341c735cfe922b24357
 2021-02-10 03:42:45 +00:00
Treehugger Robot
abebf740d0 Merge "Remove lingering debug statement from previous submission" am: c59c512e98 am: b1f881876c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1582603

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifdb738562ad01834c492826178d7f708d48eb61f
 2021-02-10 03:41:33 +00:00
Bob Badour
c54c5770db Merge "Allow cross-cutting dependencies like licenses." am: a3348295d4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1579112

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia86275340d8cda63c3cea72d487682aee3064f7d
 2021-02-10 03:10:42 +00:00
Treehugger Robot
b1f881876c Merge "Remove lingering debug statement from previous submission" am: c59c512e98 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1582603

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I56d038131ee5f1376fe38f5035a5f5af66dd3598
 2021-02-10 03:09:55 +00:00
Benjamin Schwartz
88a5af1541 Fix broken build 
Bug: 179840198
Test: Build
Change-Id: I70659d5bafd50d2b9b74277243c40f2348f92ff5
Merged-In: Ib909e678072ac5f2baefc7e273e89ef77b3b31ad
 2021-02-10 03:00:29 +00:00
Bob Badour
a3348295d4 Merge "Allow cross-cutting dependencies like licenses." 2021-02-10 02:46:40 +00:00
Treehugger Robot
c59c512e98 Merge "Remove lingering debug statement from previous submission" 2021-02-10 02:08:49 +00:00
Treehugger Robot
f2db4bc32c Merge "Ensure that stubs.symbol_file has ".map.txt" suffix" am: 509ab03f12 am: 1950b77215 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1574808

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7be5e66d818c8bb1071d881d126f84f406945154
 2021-02-10 01:22:29 +00:00
Julien Desprez
64c6d7f75c Merge "Changing default of rust_test_host to unit_tests:true" am: 7f11ed7fb4 am: 38bf37451a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1553141

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ife826d19609ce5890fd1b4adf6cb7e7d7fa6a193
 2021-02-10 01:22:22 +00:00
Jose "Pepe" Galmes
34c5caff4e Merge "Implement directed recovery snapshot." am: ee4dcdc0ad am: ab1e7cc897 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1581563

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie1e8946f350ba8d5d8a7f3642780715e88310459
 2021-02-10 01:21:47 +00:00
Treehugger Robot
1950b77215 Merge "Ensure that stubs.symbol_file has ".map.txt" suffix" am: 509ab03f12 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1574808

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic8a69aef4b1fc5a2518460224707e724519c1ec0
 2021-02-10 01:21:41 +00:00
Treehugger Robot
509ab03f12 Merge "Ensure that stubs.symbol_file has ".map.txt" suffix" 2021-02-10 01:07:30 +00:00
Julien Desprez
38bf37451a Merge "Changing default of rust_test_host to unit_tests:true" am: 7f11ed7fb4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1553141

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff7e273f758ccf1a738f595b638f2eba849c01e5
 2021-02-10 00:30:33 +00:00