StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,677 Commits 1 Branch 0 Tags
136d087a8eb198d6a16b2813d1b949493654f20b
Commit Graph

33677 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ulyana Trafimovich
136d087a8e Merge "Write module dexpreopt.config for Make." am: a4fce3b488 am: 682808f0ad 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1541538

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c0696bbcf536ddbf875c9e6c9e43bbc602b4b3f
 2021-02-01 11:02:14 +00:00
Paul Duffin
4c73a0d554 Merge "Add documentation for the different files created by hiddenapi" am: 523bb85995 am: e3b48e4034 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1564636

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I442b5bfd65dbb863d79926c562dbe81205518501
 2021-02-01 11:02:07 +00:00
Ulyana Trafimovich
682808f0ad Merge "Write module dexpreopt.config for Make." am: a4fce3b488 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1541538

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5190bbe154464569268e89d939e36e0a8fc20a05
 2021-02-01 10:39:30 +00:00
Paul Duffin
e3b48e4034 Merge "Add documentation for the different files created by hiddenapi" am: 523bb85995 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1564636

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id598ec6a02df2ea760b39ec3ff6fa61e35107cea
 2021-02-01 10:38:45 +00:00
Ulyana Trafimovich
a4fce3b488 Merge "Write module dexpreopt.config for Make." 2021-02-01 10:16:57 +00:00
Paul Duffin
523bb85995 Merge "Add documentation for the different files created by hiddenapi" 2021-02-01 10:16:50 +00:00
Treehugger Robot
d3eb10b7ed Merge "bp2build: fix running from clean checkout." am: ac175a2900 am: 90c3115c40 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1562811

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie133b514ea94046c9bfd90c9460fc551529b5465
 2021-02-01 08:08:21 +00:00
Treehugger Robot
90c3115c40 Merge "bp2build: fix running from clean checkout." am: ac175a2900 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1562811

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ba78b479516c9ada5c18678f720acd76838a76a
 2021-02-01 07:47:07 +00:00
Treehugger Robot
ac175a2900 Merge "bp2build: fix running from clean checkout." 2021-02-01 07:28:12 +00:00
Jingwen Chen
eb76c4319d bp2build: fix running from clean checkout. 
bp2build is a Soong mode that returns as soon as the BUILD files are generated. This causes it not generate the build.ninja file, which the Ninja process executing soong_build itself expects to produce as an output. If there isn't an existing build.ninja file generated from a previous build, GENERATE_BAZEL_FILES=true m nothing will fail.

This CL generates the expected files as a workaround, and also makes GENERATE_BAZEL_FILES=true skip the Kati/Ninja steps in soong_ui since they aren't needed.

Test: rm -rf out/ && GENERATE_BAZEL_FILES=true m nothing && m libc

Fixes: 178683777

Change-Id: I2515ef7961682d2be5f096ed24831cc185165a67
 2021-01-29 22:33:25 -05:00
Ivan Lozano
6604580d74 rust: Allow rust_tests to include data files. am: 9da4aa8166 am: bf557705c1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1565177

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib0b0d74e7c62adb7331020a0aa5016a14f5ba320
 2021-01-29 23:51:46 +00:00
Pete Bentley
8ba33d7e5a Merge "Revert "Delete build-aml-prebuilts.sh"" am: 9436be4321 am: c53e24c099 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1564644

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1067fd30080b43457230ed558cbb7d02d3bfae9b
 2021-01-29 23:51:13 +00:00
Ivan Lozano
bf557705c1 rust: Allow rust_tests to include data files. am: 9da4aa8166 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1565177

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb953ed4718d57dc1db3628f88409b368eeee86b
 2021-01-29 23:48:24 +00:00
Martin Stjernholm
8784b2fe5d Merge "Fix boot jar handling when both source and prebuilt APEXes and modules are present." am: c4e17317d1 am: d593a73257 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1553594

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia050858ba2a5810b0e708f61a12fe536b571af7f
 2021-01-29 23:43:27 +00:00
Pete Bentley
c53e24c099 Merge "Revert "Delete build-aml-prebuilts.sh"" am: 9436be4321 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1564644

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9972ef9bf214d816a50a5cd87e5fa0b5fe81e670
 2021-01-29 23:42:50 +00:00
Martin Stjernholm
d593a73257 Merge "Fix boot jar handling when both source and prebuilt APEXes and modules are present." am: c4e17317d1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1553594

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2318f9f24be12d67a211375eba4c98c50cf88090
 2021-01-29 23:22:34 +00:00
Anton Hansson
10353a0694 Merge "Delete build-aml-prebuilts.sh" am: 30d6f68b1a am: f06d499bb0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1535006

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9df53ac78ca67c05963edd75889e97e9623c284
 2021-01-29 22:09:52 +00:00
Anton Hansson
f06d499bb0 Merge "Delete build-aml-prebuilts.sh" am: 30d6f68b1a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1535006

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id9ce1a3e07218ea8b215a3ebebf1a54090006506
 2021-01-29 21:55:08 +00:00
Nikita Ioffe
0968f5a861 Turn apex compression from opt-out into opt-in am: 82aab58aea am: 4e36d71632 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1563633

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I108ef022f4bb1ed2c5cf602bf747574d2fe20df3
 2021-01-29 21:50:35 +00:00
Nikita Ioffe
4e36d71632 Turn apex compression from opt-out into opt-in am: 82aab58aea 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1563633

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I77afe618e9517d6b2a6a7dd8bf786af211c1bd0f
 2021-01-29 20:47:16 +00:00
Ivan Lozano
9da4aa8166 rust: Allow rust_tests to include data files. 
Adds the ability to define data files that should be installed alongside
the test.

This also fixes a bug wherein rust_test properties were duplicated.

Bug: 171710847
Test: rust_test module with "data" property installs files to device.
Change-Id: I091489afaf7e76b751a33a28049590d9fb39fe5f
 2021-01-29 14:31:32 -05:00
Pete Bentley
9436be4321 Merge "Revert "Delete build-aml-prebuilts.sh"" 2021-01-29 16:19:57 +00:00
Pete Bentley
237de41b38 Revert "Delete build-aml-prebuilts.sh" 
Revert submission 1535006-bap

Reason for revert: Looks like it breaks the build as aapt2 depends on the build_number.txt this script was generating.  Error log below.
Reverted Changes:
I0f6b34310:Delete build-aml-prebuilts.sh
I4eae4153a:Replace use of build-aml-prebuilts

Change-Id: I7f5f1b3047f3d71eb8ac7bec95c5916425d5d8f2
FAILED: ninja: 'out/aml/soong/build_number.txt', needed by 'out/aml/soong/.intermediates/frameworks/base/tools/aapt2/aapt2/linux_glibc_x86_64/unstripped/aapt2', missing and no known rule to make it
 2021-01-29 15:14:42 +00:00
Paul Duffin
ff774a04ad Add documentation for the different files created by hiddenapi 
Test: m nothing
Bug: 178361284
Change-Id: Id55646b9d4b7bc1acdb4ed6a6dd4456b746eb54c
 2021-01-29 13:19:51 +00:00
Martin Stjernholm
c4e17317d1 Merge "Fix boot jar handling when both source and prebuilt APEXes and modules are present." 2021-01-29 13:15:02 +00:00
Anton Hansson
30d6f68b1a Merge "Delete build-aml-prebuilts.sh" 2021-01-29 09:11:16 +00:00
Nikita Ioffe
82aab58aea Turn apex compression from opt-out into opt-in 
Compression is useful only for big enough apexes. We can manually opt-in
them, instead of trying to find list of apexes that should be opted-out.

Test: m
Bug: 178713634
Change-Id: Ice86fabb7c1db4a1e21e4c983d595cfd3a1c0b7a
 2021-01-28 20:25:23 +00:00
Martin Stjernholm
1dc0d6d7f2 Fix boot jar handling when both source and prebuilt APEXes and modules 
are present.

1) The boot jar to APEX mapping is maintained by the base names for
both of them. When building with prebuilt modules and APEXes, that
means we need to take care to compare them without regard to any
"prebuilt_" prefixes.

2) VisitAllModules can visit disabled modules and both source and
prebuilt modules, so they need some conditions to skip modules that
aren't applicable for boot jars.

Test: `m droid`
Test: `m droid SOONG_CONFIG_art_module_source_build=false`
  with fresh ART Module prebuilts in place
Bug: 171061220
Change-Id: Iced269d29127bc8b8f9b3171adb60a97d115628b
 2021-01-28 20:09:24 +00:00
Anton Hansson
e879d64cf8 Merge "Fix prebuilt_apis creating of "latest" incompatibilities" am: b0d0710f67 am: ebf442153d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1558554

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib4c4293da87ba27b18d7cd4107f907f44db14ae9
 2021-01-28 17:00:51 +00:00
Anton Hansson
ebf442153d Merge "Fix prebuilt_apis creating of "latest" incompatibilities" am: b0d0710f67 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1558554

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3b42313c6890dc57c4c27123889c89bc0a783eb
 2021-01-28 16:52:09 +00:00
Paul Duffin
e36b8727c1 Merge "Add boot_image module type" am: b9d731c8a9 am: 70b8c656c6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1556240

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06be6aab301bb86e24e253fa7b6d94cba258b02a
 2021-01-28 16:48:30 +00:00
Anton Hansson
b0d0710f67 Merge "Fix prebuilt_apis creating of "latest" incompatibilities" 2021-01-28 16:48:16 +00:00
Paul Duffin
70b8c656c6 Merge "Add boot_image module type" am: b9d731c8a9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1556240

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I29f2ed721092ab23f56baaa0777e8960971f5856
 2021-01-28 16:06:35 +00:00
Paul Duffin
b9d731c8a9 Merge "Add boot_image module type" 2021-01-28 15:39:57 +00:00
Treehugger Robot
2ebe689bbf Merge "apex: checks min_sdk_version for preview/current" am: 99afe0d442 am: 3f4cc86f15 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1557545

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e8ae9caa5233c3738ee51da8980b2bc8f9dc995
 2021-01-28 14:15:36 +00:00
Treehugger Robot
3f4cc86f15 Merge "apex: checks min_sdk_version for preview/current" am: 99afe0d442 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1557545

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If08666fb01725897410c6dad94f2c7cc087d90c4
 2021-01-28 13:38:41 +00:00
Treehugger Robot
99afe0d442 Merge "apex: checks min_sdk_version for preview/current" 2021-01-28 13:04:52 +00:00
Ulya Trafimovich
76b0852a48 Write module dexpreopt.config for Make. 
This is needed for Java libraries that are <uses-library> dependencies
of Java libraries and apps defined as Make modules. Each dexpreopted
module in Make generates a dexpreopt.config file, which incorporates
information from its dependencies' dexpreopt.config files. For
dependencies that are Make modules their dexpreopt.config files are
generated by Make, and for Soong modules they are generated by Soong.
Since Soong doesn't know which libraries are used by Make, it generates
build rules for a superset of the necessary libraries.

Bug: 132357300
Test: lunch aosp_cf_x86_phone-userdebug && m
Change-Id: I325b1037658736ee3c02450b08c00eca1a175962
 2021-01-28 06:29:13 +00:00
Jingwen Chen
5735458173 Merge changes Ie5f793a0,I9b9674ba am: 3b171f4013 am: 8179ddae36 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1561259

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5ee8a59a3ad9416670e398b427360a917734d310
 2021-01-28 04:28:15 +00:00
Bob Badour
b50845a745 Add APSL reciprocal licenses. am: 304fe7f197 am: 0bea56b5a9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1562556

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d6f837476f2680b3931c0c63510a86137d7ce7b
 2021-01-28 04:27:59 +00:00
Jingwen Chen
8179ddae36 Merge changes Ie5f793a0,I9b9674ba am: 3b171f4013 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1561259

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58ceeced944218393cdeffff08e03d21d80e4345
 2021-01-28 03:59:22 +00:00
Bob Badour
0bea56b5a9 Add APSL reciprocal licenses. am: 304fe7f197 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1562556

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5afb3347a9e34198cbc5d891daa0dc192ea73fb1
 2021-01-28 03:58:21 +00:00
Jingwen Chen
3b171f4013 Merge changes Ie5f793a0,I9b9674ba 
* changes:
  bp2build: support Starlark rules and load statements.
  Make bp2buildMutators registration local to TestContext.
 2021-01-28 03:35:48 +00:00
Bob Badour
304fe7f197 Add APSL reciprocal licenses. 
Test: m all

Bug: 151953481
Bug: 151177513
Bug: 67772237
Change-Id: Ia719741cb0dd3e5f8230f637c321c82377f022dc
 2021-01-27 16:51:36 -08:00
Treehugger Robot
a233dd5fda Merge "Add system/extras/simpleperf to Rust allowed paths" am: 8a0f212bfa am: a1df4dd3a2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1561616

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51122785787912777e3927a31893c7b85b4a8d89
 2021-01-27 14:16:27 +00:00
Treehugger Robot
a1df4dd3a2 Merge "Add system/extras/simpleperf to Rust allowed paths" am: 8a0f212bfa 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1561616

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie99e010b017030a8753a6db56ce462c49df84c10
 2021-01-27 13:32:50 +00:00
Treehugger Robot
8a0f212bfa Merge "Add system/extras/simpleperf to Rust allowed paths" 2021-01-27 12:13:55 +00:00
Paul Duffin
1999d04d2a Merge "Make com.android.art related tests more realistic" am: 57eec1007e am: 65964a6a90 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1560277

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94ef60fc464b13d609d8482675918094453de884
 2021-01-27 11:02:45 +00:00
Paul Duffin
65964a6a90 Merge "Make com.android.art related tests more realistic" am: 57eec1007e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1560277

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52e76fb5c2b3f38a99129b2bc33f49f6ddac330a
 2021-01-27 10:25:51 +00:00
Paul Duffin
57eec1007e Merge "Make com.android.art related tests more realistic" 2021-01-27 10:03:42 +00:00