openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
41,687 Commits 2 Branches 1 Tag 34 MiB
Commit Graph

41687 Commits

Author SHA1 Message Date
Christopher Parsons a0cff02c76 Merge "Mixed builds: propagate includes from cc_* targets" am: 1c4621af62 am: bbd6afc3fd am: fc295efce3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1688945

Change-Id: I91e7a4243a34eab20acef77e87b2ee35b74e9261
 2021-04-28 00:22:18 +00:00
Christopher Parsons fc295efce3 Merge "Mixed builds: propagate includes from cc_* targets" am: 1c4621af62 am: bbd6afc3fd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1688945

Change-Id: I7afa161969e0ee7c8b081605a43774a57165fdd6
 2021-04-27 23:55:00 +00:00
Christopher Parsons bbd6afc3fd Merge "Mixed builds: propagate includes from cc_* targets" am: 1c4621af62 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1688945

Change-Id: If3c9b7759ed52b847446b7e717fc136889d33be9
 2021-04-27 23:26:06 +00:00
Christopher Parsons 1c4621af62 Merge "Mixed builds: propagate includes from cc_* targets" 2021-04-27 23:10:33 +00:00
Roman Kiryanov 23cb57b717 Merge "Remove libqemu_pipe from minSdkVersionAllowlist" am: 5796db599f am: 9d03d58442 am: 4a52aea8f1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1688970

Change-Id: I7990e59eb3662c3b09aeac23e3827024486519a2
 2021-04-27 23:03:55 +00:00
Steven Moreland 3c42f57ec2 Merge "apex: remove use_vendor" into sc-dev 2021-04-27 22:58:47 +00:00
Roman Kiryanov 4a52aea8f1 Merge "Remove libqemu_pipe from minSdkVersionAllowlist" am: 5796db599f am: 9d03d58442 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1688970

Change-Id: I4ccbf9d34ce6e3aa961e59520162c30e94dfe690
 2021-04-27 22:29:24 +00:00
Roman Kiryanov 9d03d58442 Merge "Remove libqemu_pipe from minSdkVersionAllowlist" am: 5796db599f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1688970

Change-Id: Id549d226b8206a1902ede9008134ec1c99acc7f4
 2021-04-27 22:11:33 +00:00
Roman Kiryanov 5796db599f Merge "Remove libqemu_pipe from minSdkVersionAllowlist" 2021-04-27 21:54:58 +00:00
Roman Kiryanov fc48433640 Remove libqemu_pipe from minSdkVersionAllowlist 
libqemu_pipe was retired.

Bug: 175046060
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I4ac17966ad2a7609a9d71b8884351d70b5996b9d
 2021-04-27 13:05:48 -07:00
Chris Parsons f60ecf081e Mixed builds: propagate includes from cc_* targets 
This allows us to remove libasync_safe from the mixed builds denylist.

Test: mixed_libc.sh CI script
Change-Id: Ibafd231284864078bf30340f919d39e5098843ce
 2021-04-27 15:04:37 -04:00
Paul Duffin 7fbc5842cd Merge "Extract default image specific logic from buildBootImage" am: 6d4de43833 am: 29b18b8c17 am: 8db612ebab 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686149

Change-Id: Ic8a3591508399db477da9a72f21ee9619373cebc
 2021-04-27 17:43:17 +00:00
Paul Duffin 6aa72dca5e Merge "Simplify missing deps handling in buildBootImage" am: c42a738bc4 am: c7cf6ac1e7 am: 3d87058cf8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686148

Change-Id: I9a4ec33c1b70563b23791588f132444cc384d7f7
 2021-04-27 17:43:11 +00:00
Paul Duffin 67cb5fb7f3 Merge "Remove panics from reportMissingVariationDependency" am: a75af16878 am: b49dae2874 am: 539a24e1d0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686147

Change-Id: I8e184836ffec1c13cbefc802db9761999a0f0dfd
 2021-04-27 17:43:02 +00:00
Colin Cross db4827278d Merge "Add support for cc_library_headers to replace llndk_headers" am: 8fb66f48c7 am: 2e9f993439 am: 2a1eb2b563 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687471

Change-Id: If11311fab123d878c3bd702e7e918fcb0e480e8b
 2021-04-27 17:42:55 +00:00
Colin Cross 8b4fe4fc08 Merge "Skip default dependencies for header libraries" am: 4ba70ab48e am: e125ff0d7b am: ec17b78b49 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687468

Change-Id: Ica73f6d083258d9ced85ee4a25f6f5a7e3715aeb
 2021-04-27 17:42:49 +00:00
Steven Moreland ae5453f6ad Merge "start eating include_dirs from both ends" am: ac9dc817b8 am: 294019346e am: 0cac14f204 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687472

Change-Id: Id6a353e4e697c2ed783b0b83e8361ee34a263e9a
 2021-04-27 17:42:41 +00:00
Paul Duffin 8db612ebab Merge "Extract default image specific logic from buildBootImage" am: 6d4de43833 am: 29b18b8c17 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686149

Change-Id: Ifd9767dc1b40ac4a5346c7528329fb314aadfddc
 2021-04-27 17:42:25 +00:00
Paul Duffin 3d87058cf8 Merge "Simplify missing deps handling in buildBootImage" am: c42a738bc4 am: c7cf6ac1e7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686148

Change-Id: I9d5ef5fce5a283d55e7128fd41869e6dd8db5ff0
 2021-04-27 17:42:16 +00:00
Paul Duffin 539a24e1d0 Merge "Remove panics from reportMissingVariationDependency" am: a75af16878 am: b49dae2874 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686147

Change-Id: Ie70916fa9d33bf32e9e6bd41506e07d7a721e391
 2021-04-27 17:41:55 +00:00
Paul Duffin 29b18b8c17 Merge "Extract default image specific logic from buildBootImage" am: 6d4de43833 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686149

Change-Id: I1cd64a036c7c00d7937e9801b309e2aefb459e04
 2021-04-27 17:21:38 +00:00
Paul Duffin c7cf6ac1e7 Merge "Simplify missing deps handling in buildBootImage" am: c42a738bc4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686148

Change-Id: If3ba77102465471104e3f001f878c4bb1615a257
 2021-04-27 17:21:29 +00:00
Paul Duffin b49dae2874 Merge "Remove panics from reportMissingVariationDependency" am: a75af16878 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686147

Change-Id: I837996812cb588662631bbc35badb88a2a6301a3
 2021-04-27 17:20:41 +00:00
Colin Cross 2a1eb2b563 Merge "Add support for cc_library_headers to replace llndk_headers" am: 8fb66f48c7 am: 2e9f993439 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687471

Change-Id: Id7018933824231da25d3fd2f905fe07ff98b09b2
 2021-04-27 17:16:09 +00:00
Colin Cross ec17b78b49 Merge "Skip default dependencies for header libraries" am: 4ba70ab48e am: e125ff0d7b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687468

Change-Id: I6c0894f0a223bf3912ead88f876f5d57ed43c25e
 2021-04-27 17:16:03 +00:00
Steven Moreland 0cac14f204 Merge "start eating include_dirs from both ends" am: ac9dc817b8 am: 294019346e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687472

Change-Id: If16378d4b90579be31dd51208d433f7e881e9642
 2021-04-27 17:15:54 +00:00
Paul Duffin 6d4de43833 Merge "Extract default image specific logic from buildBootImage" 2021-04-27 17:01:23 +00:00
Paul Duffin c42a738bc4 Merge "Simplify missing deps handling in buildBootImage" 2021-04-27 17:00:42 +00:00
Paul Duffin a75af16878 Merge "Remove panics from reportMissingVariationDependency" 2021-04-27 17:00:22 +00:00
Colin Cross 2e9f993439 Merge "Add support for cc_library_headers to replace llndk_headers" am: 8fb66f48c7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687471

Change-Id: Id427b137b951f53dd1d70d26ad41755311819d95
 2021-04-27 16:53:43 +00:00
Colin Cross e125ff0d7b Merge "Skip default dependencies for header libraries" am: 4ba70ab48e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687468

Change-Id: I2e40e73ea5099e88ed65bb8eaf6bea0c51b9ee42
 2021-04-27 16:53:33 +00:00
Steven Moreland 294019346e Merge "start eating include_dirs from both ends" am: ac9dc817b8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687472

Change-Id: I4438c69719e627c40b459e5c2fb2351649b93876
 2021-04-27 16:52:51 +00:00
Colin Cross 8fb66f48c7 Merge "Add support for cc_library_headers to replace llndk_headers" 2021-04-27 16:40:48 +00:00
Colin Cross 4ba70ab48e Merge "Skip default dependencies for header libraries" 2021-04-27 16:40:37 +00:00
Steven Moreland ac9dc817b8 Merge "start eating include_dirs from both ends" 2021-04-27 16:34:24 +00:00
Lukács T. Berki bd018b4e34 Merge "Reorganize and cull cc_library_static denylist." am: c860588763 am: 39997be8de am: 752fd9545b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687871

Change-Id: I94200ce2a4cd8439fda2bc1260a0b07ff93ef581
 2021-04-27 15:43:28 +00:00
Lukács T. Berki 752fd9545b Merge "Reorganize and cull cc_library_static denylist." am: c860588763 am: 39997be8de 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687871

Change-Id: Ib8f6e795de6c951b7164954b1e125a0752de37fb
 2021-04-27 15:26:30 +00:00
Lukács T. Berki 39997be8de Merge "Reorganize and cull cc_library_static denylist." am: c860588763 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687871

Change-Id: Id022b9a4cdd05f7141e978f6b50832e53908c334
 2021-04-27 15:00:23 +00:00
Paul Duffin 5861242a78 Extract default image specific logic from buildBootImage 
Previously, buildBootImage had to be called for the default boot image
config before the art boot image config as it created some rules which
were specific to default boot image. The creation of these rules was
encapsulated in Config().Once(..) to ensure that they were only ever
created once.

This change extracts that functionality out of buildBootImage to the
calling method which means that they are only called once and so no
longer need protecting against being called again.

Bug: 177892522
Test: m droid
Change-Id: I464477de1a08df15e577873a9accf7db2bc088d1
 2021-04-27 15:56:47 +01:00
Paul Duffin 57e2e7d199 Simplify missing deps handling in buildBootImage 
Previously, the buildBootImage function maintained a list of
missingDeps that was returned from findAndCopyBootJars and was passed
to various other methods that created ninja rules that depended on the
files created by findAndCopyBootJars. The purpose of that list was
basically to record that findAndCopyBootJars could not find some files
so that the subsequent ninja rules could be marked as being in error.

This changes avoids having to explicitly propagate the missing deps to
each rule by instead having findAndCopyBootJars generate an error rule
instead of a Cp rule for any missing file. That means that any attempt
to build any rule that depends on the missing file will fail when the
missing file is created.

Bug: 177892522
Test: Add an unknown module to PRODUCT_BOOT_JARS
      lunch art_module_arm64
      - Run each of the following targets and made sure it failed with a
        message indicating that the unknown module was missing.
      m SOONG_ALLOW_MISSING_DEPENDENCIES=true out/soong/module_arm64/dex_bootjars/boot.prof
      m SOONG_ALLOW_MISSING_DEPENDENCIES=true out/soong/generic_arm64/dex_bootjars/boot.bprof
      m SOONG_ALLOW_MISSING_DEPENDENCIES=true out/soong/generic_arm64/dex_bootjars/updatable-bcp-packages.txt
Change-Id: Ib7196c128419fbffdfeb61c1c5d47a3b08d1e132
 2021-04-27 15:56:47 +01:00
Paul Duffin 81667c8c11 Remove panics from reportMissingVariationDependency 
The code that has been removed triggers in many cases when it should
not, e.g. an unknown module on the bootclasspath. The code was
originally added to try and ensure that if the attempt to add useful
error messages failed it would help debug the issue. However, it ended
up just creating more failures.

If this does become an issue then this will be revisited.

Bug: 177892522
Test: Add an unknown module to PRODUCT_BOOT_JARS
      m SOONG_ALLOW_MISSING_DEPENDENCIES=true
Change-Id: I08dbd4b29d301f3f1f78a0fb396687062b47deb8
 2021-04-27 15:56:47 +01:00
Lukács T. Berki c860588763 Merge "Reorganize and cull cc_library_static denylist." 2021-04-27 14:42:00 +00:00
Treehugger Robot ddff27cde6 Merge "bp2build: fix exclude_srcs in subpackages." am: 6de44e74c8 am: cc2142c684 am: 5132601632 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687510

Change-Id: Ic93ffff60b9522c4163e0a76942e089655653cfb
 2021-04-27 14:39:16 +00:00
Treehugger Robot 5132601632 Merge "bp2build: fix exclude_srcs in subpackages." am: 6de44e74c8 am: cc2142c684 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687510

Change-Id: I8d365743faca9716f201c2ccbed5d00c11b5ef0b
 2021-04-27 14:22:09 +00:00
Treehugger Robot cc2142c684 Merge "bp2build: fix exclude_srcs in subpackages." am: 6de44e74c8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687510

Change-Id: Idb05de2922c7d8fcd24ba08b604168ea6e044ac0
 2021-04-27 14:07:03 +00:00
Treehugger Robot 6de44e74c8 Merge "bp2build: fix exclude_srcs in subpackages." 2021-04-27 13:48:46 +00:00
Jingwen Chen 2ac07ef533 bp2build: arch-specific exclude_srcs and srcs. am: e32e9e07d7 am: ced8f4de70 am: e502413a8e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1684590

Change-Id: Iefff3fe126f3f434f123a7ef6be157a2df863f73
 2021-04-27 13:45:19 +00:00
Jingwen Chen e502413a8e bp2build: arch-specific exclude_srcs and srcs. am: e32e9e07d7 am: ced8f4de70 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1684590

Change-Id: I6691c22ae8dc8a9c20e957c8e1133968faf77b2c
 2021-04-27 13:28:45 +00:00
Jingwen Chen ced8f4de70 bp2build: arch-specific exclude_srcs and srcs. am: e32e9e07d7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1684590

Change-Id: Ic10b59039b567fd1b36882a0438b3b00c7f869c8
 2021-04-27 13:03:43 +00:00
Lukacs T. Berki b5ac5af618 Reorganize and cull cc_library_static denylist. 
Take two: this time, put libasync_safe on the mixed build denylist
because it seems to break things.

Test: Presubmits + testing the offending action using a Ninja
invocation. "m droid dist" also running.

Change-Id: I7912b6670980776d981d874dab157b0268693ab2
 2021-04-27 15:00:45 +02:00