StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,894 Commits 1 Branch 0 Tags
3b8a42e6016d485e55fbb19bc56b1dabf8504a95
Commit Graph

3782 Commits

Author SHA1 Message Date
Anton Hansson
3b8a42e601 Merge "Use genrule instead of filegroup for api files" am: 3de06eae5b am: e223268ed8 am: 9b74b06e65 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1592331

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I71d2c8582bd5d8e1651c8df5971354024dbc5e2b
 2021-02-18 10:48:42 +00:00
Martin Stjernholm
c4a1ede482 Merge "Move the logic to add jacocoagent in instrumentation builds to make." am: 71c139dced am: 2eed280a39 am: dd34be43f1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1592232

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86b1c559c714826a4fa4d4ae47ab85d07322715f
 2021-02-18 10:48:29 +00:00
Anton Hansson
9b74b06e65 Merge "Use genrule instead of filegroup for api files" am: 3de06eae5b am: e223268ed8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1592331

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3e7f7af46b93dd25fb5eca1e820bf32b2e1144c
 2021-02-18 10:43:19 +00:00
Anton Hansson
3de06eae5b Merge "Use genrule instead of filegroup for api files" 2021-02-18 09:28:01 +00:00
Martin Stjernholm
dd34be43f1 Merge "Move the logic to add jacocoagent in instrumentation builds to make." am: 71c139dced am: 2eed280a39 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1592232

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I526b557a0e82d2b953b0b603ae8b2a5dc9bcba95
 2021-02-18 09:06:43 +00:00
Ulyana Trafimovich
92dac721f6 Revert^3 "Enforce <uses-library> checks for android_app and android_app_import." 
This reverts commit c2b6b65d73.

Reason for revert: These changes should only be reverted in
  rvc-qpr-dev-plus-aosp, but not in master.

Bug: 132357300
Test: treehugger
Change-Id: I3243668ce9a399936b0e9dde09c42db6cc45d562
 2021-02-17 18:13:33 +00:00
Anton Hansson
c79d412b8a Use genrule instead of filegroup for api files 
filegroups have the unfortunate limitation that they don't create phony
targets for building them in a convenient way. Also, having a single
output file fits better with the genrule concept.

Test: m framework-sdkextensions.api.public.latest
Change-Id: I229410658b04403ff1ff6abd4116a65aaa02b83b
 2021-02-17 17:16:43 +00:00
Martin Stjernholm
0a9dae6e9a Move the logic to add jacocoagent in instrumentation builds to make. 
Test: m nothing
Test: m nothing EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true
Bug: 180325915
Change-Id: Ieec8c8a122ff930e14cef4b5a0a2f9fc9e3b70ad
 2021-02-17 14:41:07 +00:00
Jiyong Park
7d43709811 Revert "data dependency of java_test_host can be arch-specific" am: 2b0e4908c2 am: 4362e740af am: 1cea07c8ab 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1588300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25b7c1b75a28247ce220fc09b50d9faa96b90fc1
 2021-02-17 00:45:48 +00:00
Jiyong Park
1cea07c8ab Revert "data dependency of java_test_host can be arch-specific" am: 2b0e4908c2 am: 4362e740af 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1588300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e78f3d281517016afeb7b24d5dd1b8249124183
 2021-02-17 00:25:41 +00:00
Jiyong Park
4362e740af Revert "data dependency of java_test_host can be arch-specific" am: 2b0e4908c2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1588300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae42079a404a59730f2eb622fa39d462610f0c50
 2021-02-16 23:54:29 +00:00
Treehugger Robot
b913011777 Merge changes from topic "mkboot" 
* changes:
  prebuilt_etc is OutputFileProducer
  Revert "`data` dependency of java_test_host can be arch-specific"
 2021-02-16 23:27:32 +00:00
Paul Duffin
f7101aee5c Allow explicitly specified additional annotations for hiddenapi am: 031d8693b3 am: bf069dad5a am: de2b2c98bb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1587494

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7afd1593fb019fa80ac8266d2a494008b584993
 2021-02-16 19:46:50 +00:00
Paul Duffin
de2b2c98bb Allow explicitly specified additional annotations for hiddenapi am: 031d8693b3 am: bf069dad5a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1587494

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ecd067d64af390dfebd2bdbf3520765dbda3906
 2021-02-16 18:52:01 +00:00
Paul Duffin
031d8693b3 Allow explicitly specified additional annotations for hiddenapi 
Adds the hiddenapi_additional_annotations to allow a library to list
the libraries that provided additional hiddenapi related annotations
for a library.

Modifies merge_csv.py so it can process multiple zip files at the same
time and uses that to merge the embedded .uau files from a module and
those it depends upon.

Bug: 180102243
Test: m droid
      Verified that hiddenapi files (both aggregated ones and for the
      individual modules) are not affected by this change.
Change-Id: I796520021c7357398a9e2a09f1029e4a578b05b3
 2021-02-16 13:28:26 +00:00
Jiyong Park
2b0e4908c2 Revert "data dependency of java_test_host can be arch-specific" 
This reverts commit cdd9b8392d.

Reason: this doesn't work. java_test_host is a multi target module.
Therefore, `arch.<arhc>.data` is not collapsed to `data` by the arch
mutator.

Bug: N/A
Test: N/A
Change-Id: I755b06718bacfe1513f6ad1e734e5a0d0ac57cd8
 2021-02-16 06:58:53 +09:00
Anton Hansson
9fda310903 Merge "Fix api_fingerprint.txt generation" am: 404adeefdc am: c0777462c5 am: 7c9e60e17c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1581731

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If70bb62104c8325e65e1d6ce78e5d04bc5948b66
 2021-02-15 13:06:02 +00:00
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
404adeefdc Merge "Fix api_fingerprint.txt generation" 2021-02-15 11:31:37 +00:00
Colin Cross
89aceaf5bb Merge "Convert java.Dependency to JavaInfo provider" am: b87f4b4cab am: d8e4a38924 am: e34846731c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1581950

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia9d9fabb74ae93af91ac4a43ec6d822bc6748389
 2021-02-13 02:31:47 +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
b87f4b4cab Merge "Convert java.Dependency to JavaInfo provider" 2021-02-13 00:39:24 +00:00
Paul Duffin
a043ca3586 Merge changes I831da5fa,I866916c9 am: c66769ddd9 am: 53606f14c3 am: 37f1591a5e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1579441

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I36b9fbacf953d98633b38a9183b4d455aa27fc22
 2021-02-12 11:29:52 +00: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
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
Treehugger Robot
fbc7b966a2 Merge "Add LOCAL_LICENSE_KINDS to build/soong" am: b68036f44b am: 0a1087f291 am: 66a854d585 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1575543

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icb7ac70ed37be73b84da59f8e1ad88daea3bfa80
 2021-02-10 09:28: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
b68036f44b Merge "Add LOCAL_LICENSE_KINDS to build/soong" 2021-02-10 07:18:29 +00:00
Bob Badour
b98ac88735 Merge "Allow cross-cutting dependencies like licenses." am: a3348295d4 am: c54c5770db am: 1ceaa1295c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1579112

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc52afba3187b8a0964563ed70c17645ed401ddd
 2021-02-10 04:02:34 +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
Bob Badour
a3348295d4 Merge "Allow cross-cutting dependencies like licenses." 2021-02-10 02:46:40 +00:00
Treehugger Robot
1a590b58b4 Merge "Add android_test_helper_app properties to java_defaults" am: a6cfcac727 am: 747e441f33 am: ed2d9815c4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1579791

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I17074b09a7b6280b5bb5c9c28bb30a78f193ea85
 2021-02-09 23:45:19 +00:00
Colin Cross
dcf71b299c Convert java.Dependency to JavaInfo provider 
Export information about java dependencies through a Provider
instead of accessing the module directly.

Test: java_test.go
Test: no changes to build.ninja
Change-Id: Ifc5d566bf6f6ebc0ad399e948effaa1ef6a22876
 2021-02-09 15:36:25 -08:00
Treehugger Robot
ed2d9815c4 Merge "Add android_test_helper_app properties to java_defaults" am: a6cfcac727 am: 747e441f33 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1579791

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I50300bd49812dc509855e9343f93a3f4003f570c
 2021-02-09 22:49:31 +00:00
Treehugger Robot
a6cfcac727 Merge "Add android_test_helper_app properties to java_defaults" 2021-02-09 21:10:27 +00:00
Colin Cross
cbce0b0dbd Add android_test_helper_app properties to java_defaults 
Allows android_test_helper_apps to get their test_suites and
auto_gen_config properties from a java_defaults module.

Fixes: 179744452
Test: m checkbuild
Change-Id: Ifa09f9fd0a51d3a9682401e4c6bd2f82cd4f1b8a
 2021-02-09 10:38:30 -08:00
Paul Duffin
11c732eb74 Merge "Move hiddenapi tools used by build/soong from frameworks/base" am: 937c91c406 am: d1f586407c am: 2f48726a64 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1579437

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d2050dfaafd828de15c943d6feb61bfec7061fd
 2021-02-09 17:19:05 +00:00
Paul Duffin
2f48726a64 Merge "Move hiddenapi tools used by build/soong from frameworks/base" am: 937c91c406 am: d1f586407c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1579437

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4dd3d3c573eca04f6b8dcf92b18d73e019f1b46c
 2021-02-09 16:48:45 +00:00
Paul Duffin
b98aaf5200 Merge "Allow dex jars from prebuilt_apex to be used by hiddenapi" am: 320e170675 am: 915cb8c6d8 am: b6256e51cb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1578285

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7716a193d98d9005334b33f641906da6491dc6e4
 2021-02-09 15:45:04 +00:00
Paul Duffin
01cc9163b0 Merge "Refactor the hiddenAPI() method for reusability" am: b71a8de0d5 am: 714a66dfdd am: 061c4657d7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1578284

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I81dd9a89c4e77edbac1669a0fa2feaadd4c3064c
 2021-02-09 15:44:59 +00:00
Paul Duffin
08df344e9f Merge "Extract initHiddenAPI() from hiddenapi()" am: abe1abd224 am: 36d3011783 am: fd7610df22 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1578283

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99550ff783f029ba3dbf7ff2cd483a1c0b51b841
 2021-02-09 15:44:47 +00:00
Paul Duffin
b6256e51cb Merge "Allow dex jars from prebuilt_apex to be used by hiddenapi" am: 320e170675 am: 915cb8c6d8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1578285

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic96272d781806b7afb5b4afb2e81130ac131b43d
 2021-02-09 15:18:20 +00:00
Paul Duffin
061c4657d7 Merge "Refactor the hiddenAPI() method for reusability" am: b71a8de0d5 am: 714a66dfdd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1578284

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09df412275fbfaa1ac67a36d5fc3f6b4b5ba0418
 2021-02-09 15:18:14 +00:00
Paul Duffin
fd7610df22 Merge "Extract initHiddenAPI() from hiddenapi()" am: abe1abd224 am: 36d3011783 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1578283

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I75aeebfbfc844b45bc99b3c395b82e7c148e4a5b
 2021-02-09 15:18:08 +00:00
Paul Duffin
937c91c406 Merge "Move hiddenapi tools used by build/soong from frameworks/base" 2021-02-09 15:17:42 +00:00
Paul Duffin
320e170675 Merge "Allow dex jars from prebuilt_apex to be used by hiddenapi" 2021-02-09 13:58:12 +00:00
Paul Duffin
b71a8de0d5 Merge "Refactor the hiddenAPI() method for reusability" 2021-02-09 13:57:52 +00:00
Paul Duffin
abe1abd224 Merge "Extract initHiddenAPI() from hiddenapi()" 2021-02-09 13:57:37 +00:00