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,377 Commits 2 Branches 1 Tag 34 MiB
Commit Graph

41377 Commits

Author SHA1 Message Date
Jaewoong Jung 78ec488af0 Merge "Make apex.key and certificate overridable." am: 6a328ff8ac am: 78939b2bc6 am: e3f8cfe47e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1682218

Change-Id: I81a07e4acd1bbc29413996d3f3b22f3050fd08f9
 2021-04-22 16:18:13 +00:00
Treehugger Robot 0b3271220f Merge "Revert "Add debug ramdisk variant"" am: f9c6744e28 am: ae210266fd am: e6bdf43b20 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1684345

Change-Id: Ic652022b750d9aad6f88f2feb742e0b84426cf9e
 2021-04-22 16:18:05 +00:00
Paul Duffin 5bca2f26f2 Merge "Move monolithic stub flags generation to platform_bootclasspath" am: 57d13c6892 am: 5774eb9e14 am: ea69b4109b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1683866

Change-Id: Id0e5e6dc8596b7d47fe65c47a66da7a86c20c6cb
 2021-04-22 16:17:56 +00:00
Paul Duffin 1dfa82423f Merge "Extract common stub flags code" am: d631512659 am: d8d72e85f6 am: 9b76c7bee2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1683865

Change-Id: I1225ec1b03ec04745e982918d8540298a7f6b9de
 2021-04-22 16:17:20 +00:00
Jaewoong Jung e3f8cfe47e Merge "Make apex.key and certificate overridable." am: 6a328ff8ac am: 78939b2bc6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1682218

Change-Id: I936a8e29719a14195e380c59911b231936854119
 2021-04-22 15:53:42 +00:00
Treehugger Robot e6bdf43b20 Merge "Revert "Add debug ramdisk variant"" am: f9c6744e28 am: ae210266fd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1684345

Change-Id: Ibd01f766e315cc6cf0c25b5b3203a89549d8fc4c
 2021-04-22 15:53:33 +00:00
Paul Duffin ea69b4109b Merge "Move monolithic stub flags generation to platform_bootclasspath" am: 57d13c6892 am: 5774eb9e14 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1683866

Change-Id: Ia4b4ad562a0e90351334cae9a323466f6c7a569b
 2021-04-22 15:53:26 +00:00
Paul Duffin 9b76c7bee2 Merge "Extract common stub flags code" am: d631512659 am: d8d72e85f6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1683865

Change-Id: I2aa0acb55e98e1399516f582525419d93fbadc14
 2021-04-22 15:53:13 +00:00
Jaewoong Jung 78939b2bc6 Merge "Make apex.key and certificate overridable." am: 6a328ff8ac 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1682218

Change-Id: Ia994ae6bfdac031ef55dfb633bb4dd3f51e6311a
 2021-04-22 15:43:40 +00:00
Jaewoong Jung 6a328ff8ac Merge "Make apex.key and certificate overridable." 2021-04-22 15:37:22 +00:00
Treehugger Robot ae210266fd Merge "Revert "Add debug ramdisk variant"" am: f9c6744e28 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1684345

Change-Id: I92d9aaf2d1eafe621bf28710564b9b129d5367b8
 2021-04-22 15:35:27 +00:00
Paul Duffin 5774eb9e14 Merge "Move monolithic stub flags generation to platform_bootclasspath" am: 57d13c6892 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1683866

Change-Id: I5534c2a10a19d0b433bfa2955326215bf3df16eb
 2021-04-22 15:35:14 +00:00
Paul Duffin d8d72e85f6 Merge "Extract common stub flags code" am: d631512659 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1683865

Change-Id: I894fd306eaae9ef0a58ee4a8b73269117cc68374
 2021-04-22 15:34:25 +00:00
Treehugger Robot f9c6744e28 Merge "Revert "Add debug ramdisk variant"" 2021-04-22 15:28:06 +00:00
Paul Duffin 57d13c6892 Merge "Move monolithic stub flags generation to platform_bootclasspath" 2021-04-22 15:06:16 +00:00
Paul Duffin 3656abcf6d Merge "Allow generate_hiddenapi_lists.py to work with no custom flag files" am: eee990820b am: 04378bd2ba am: aae44728e4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1682096

Change-Id: I2fa7b17c3600f2f9197a5443105f8c36cd5f2fcf
 2021-04-22 15:05:58 +00:00
Paul Duffin d631512659 Merge "Extract common stub flags code" 2021-04-22 15:05:54 +00:00
Paul Duffin 677de9427b Merge changes I67589bcc,Ibcfae390 am: 7cbdf81e95 am: 33f495f305 am: 13b9d25ed4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1683868

Change-Id: Idb4d7af1bf9914bf7bf0306d04daf74ee992fc5e
 2021-04-22 15:05:03 +00:00
Paul Duffin aae44728e4 Merge "Allow generate_hiddenapi_lists.py to work with no custom flag files" am: eee990820b am: 04378bd2ba 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1682096

Change-Id: Iac0e41d260b473623ebb8be1df1ef1b2e5bb457c
 2021-04-22 14:41:51 +00:00
Paul Duffin 13b9d25ed4 Merge changes I67589bcc,Ibcfae390 am: 7cbdf81e95 am: 33f495f305 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1683868

Change-Id: I1b3d7fae197d3e072ac205cfe8e09a1c6bf0ddc3
 2021-04-22 14:41:43 +00:00
Paul Duffin 04378bd2ba Merge "Allow generate_hiddenapi_lists.py to work with no custom flag files" am: eee990820b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1682096

Change-Id: I092ad11719b3a1a4a861bb26cc7b5aebe04d1028
 2021-04-22 14:23:15 +00:00
Paul Duffin 33f495f305 Merge changes I67589bcc,Ibcfae390 am: 7cbdf81e95 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1683868

Change-Id: Ie19e2285fd129b52e17a8df6091ac53be126794b
 2021-04-22 14:18:03 +00:00
Paul Duffin eee990820b Merge "Allow generate_hiddenapi_lists.py to work with no custom flag files" 2021-04-22 14:05:22 +00:00
Paul Duffin 7cbdf81e95 Merge changes I67589bcc,Ibcfae390 
* changes:
  Replace boot image with bootclasspath fragment in sdk package
  bootclasspath_fragment must only depend on source contents
 2021-04-22 14:02:43 +00:00
Anton Hansson 67e20e2ff8 Merge "Add new stub_only_static_libs attr for sdk_library" am: 24eac476d4 am: ec47b30e0e am: 05ecab28a3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1682097

Change-Id: Ie716a56bd455bead4ee1bad88203cb7d24d10512
 2021-04-22 13:39:57 +00:00
Paul Duffin 74431d57c6 Move monolithic stub flags generation to platform_bootclasspath 
As part of that this change:
* Moves code that will be common to platform_bootclasspath and
  bootclasspath_fragment from hiddenapi_singleton.go into
  hiddenapi_modular.go.
* Fixes the tests in hiddenapi_singleton_test.go but intentionally
  does not rename them or move them into a more appropriate place so
  as to make it easier to see the differences. A TODO has been added
  and these will be cleaned up in a follow up change.

Bug: 179354495
Test: verified that the monolithic out/soong/hiddenapi/... files are
      unchanged by this change
Change-Id: I680e4dab2e6bdf4a655fa9f255c195175904667e
 2021-04-22 14:23:28 +01:00
Paul Duffin 3e7fcc3fe7 Extract common stub flags code 
The stubFlagsRule does three separate tasks:
1. It computes the set of modules that provide the stubs.
2. It scans all the modules to find the stub modules and retrieves the
   paths to their dex files.
3. It constructs the ninja rule.

Of those three tasks, 1 and 3 will be same for the
platform_bootclasspath. Instead of searching all the modules for the
ones that provide the stubs it will simply add dependencies onto the
stub modules and retrieve the dex file paths from them.

This change extracts tasks 1 and 3 into separate methods for reuse. It
also parameterizes the generation of the ninja rule.

Bug: 179354495
Test: verified that the monolithic out/soong/hiddenapi/... files are
      unchanged by this change
Change-Id: I893845dbddc4b001dfd44d0e0b1c8a31b7f3f89f
 2021-04-22 14:23:08 +01:00
Anton Hansson 05ecab28a3 Merge "Add new stub_only_static_libs attr for sdk_library" am: 24eac476d4 am: ec47b30e0e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1682097

Change-Id: Iafe4f8df922fc2234de596b1f1c3819accc50656
 2021-04-22 13:11:33 +00:00
Anton Hansson ec47b30e0e Merge "Add new stub_only_static_libs attr for sdk_library" am: 24eac476d4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1682097

Change-Id: If44f96ef58aad4453e76b6c6c458fd6942fa3f48
 2021-04-22 12:54:17 +00:00
Anton Hansson 24eac476d4 Merge "Add new stub_only_static_libs attr for sdk_library" 2021-04-22 12:41:46 +00:00
Jingwen Chen 26cb01c4a4 bp2build: refactor/standardize cc_* bp2build converters am: ed9c17d033 am: 0a52f7276e am: 8bddaab06a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1674326

Change-Id: I5874807a960a030a8f7367d3ce877b2542100b84
 2021-04-22 11:28:47 +00:00
Jingwen Chen 8bddaab06a bp2build: refactor/standardize cc_* bp2build converters am: ed9c17d033 am: 0a52f7276e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1674326

Change-Id: I96a75997b408f7b17f1caf9107f544ad4a538388
 2021-04-22 10:59:28 +00:00
Jingwen Chen 0a52f7276e bp2build: refactor/standardize cc_* bp2build converters am: ed9c17d033 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1674326

Change-Id: I1cc8f6c9681346d3d7dff316d2b37e5bdaccf30d
 2021-04-22 10:36:37 +00:00
Anton Hansson dae54cd84f Add new stub_only_static_libs attr for sdk_library 
Allow java_sdk_libraries to include libraries statically into their
stubs. The immediate use-case of this is to embed libcore notice files
into their stubs.

Also extend the java_sdk_library tests for impl/stub-only-libs, plus
some not assert utils.

Bug: 173186484
Bug: 184839599
Test: soong tests
Change-Id: I1ebf2f35c048eab5cec5125482a0304fe660f188
 2021-04-22 10:20:13 +01:00
Jingwen Chen ed9c17d033 bp2build: refactor/standardize cc_* bp2build converters 
This CL refactors the cc* bp2build converters to use the common
attribute extractors in cc/bp2build.go.

This also adds include_build_directory to be handled by the compiler
attr extractor to generate recursive headers as inputs.

This also turns include_dirs and local_include_dirs into the
execroot-relative -I flags.

e.g. if a module in  bionic/libc has "private" in local_include_dirs,
the "-Ibionic/libc/private" copt is generated for it.

Fixes: 185139955

Test: TH
Test: Forrest for mixed_clean-droid
Change-Id: Ib67056482227e62068fbbea0455035bdf5d56319
 2021-04-22 08:31:24 +00:00
Rupert Shuttleworth 51fbe9023c Merge "Add various test files as testSrcs, so that they run on CI." am: dac451715b am: 950c2381dd am: bd7a5537b8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1683265

Change-Id: I689bd1e06c0ddf6166d8ff01496898095df72c97
 2021-04-22 04:17:02 +00:00
Rupert Shuttleworth bd7a5537b8 Merge "Add various test files as testSrcs, so that they run on CI." am: dac451715b am: 950c2381dd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1683265

Change-Id: I9e1739c19cab87cdc17bed5a88e21e52f9d0f6df
 2021-04-22 03:55:31 +00:00
Treehugger Robot 684051abed Merge "Add tempPathForRestat to improve consistency" am: f434cb5c1d am: 6c1532d37e am: 5aab26cdda 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1683867

Change-Id: Ib5b3dc68a1af2d479bd1b09546174c7c0f8c25e6
 2021-04-22 03:37:46 +00:00
Rupert Shuttleworth 950c2381dd Merge "Add various test files as testSrcs, so that they run on CI." am: dac451715b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1683265

Change-Id: I778645f091d2278072423174dba25c9dd238413b
 2021-04-22 03:35:53 +00:00
Treehugger Robot 5aab26cdda Merge "Add tempPathForRestat to improve consistency" am: f434cb5c1d am: 6c1532d37e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1683867

Change-Id: I014911a6d439cdb52ddcc5372eaa6e03506e8ebb
 2021-04-22 03:12:43 +00:00
Rupert Shuttleworth dac451715b Merge "Add various test files as testSrcs, so that they run on CI." 2021-04-22 03:08:21 +00:00
Treehugger Robot 6c1532d37e Merge "Add tempPathForRestat to improve consistency" am: f434cb5c1d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1683867

Change-Id: I694cc0ae72c9679dcb3f7fa53f553dc9e6f7ca85
 2021-04-22 02:48:06 +00:00
Treehugger Robot f434cb5c1d Merge "Add tempPathForRestat to improve consistency" 2021-04-22 02:22:58 +00:00
Bowgo Tsai 78ea2f5eac Revert "Add debug ramdisk variant" 
This reverts commit f84e9c05e2.

Because this breaks the usage of boot-debug.img and
vendor_boot-debug.img

Bug: 185970130
Bug: 185990198
Test: make bootimage_debug
Change-Id: I7886c971982faae1d5bc34688643de8d94d6e201
 2021-04-22 09:49:24 +08:00
Treehugger Robot 5c1084e2dd Merge changes I9a08bbc0,I049d1bb9 am: 752d63cd83 am: e8bfb5a3a0 am: 13fc2fa05c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1682583

Change-Id: I482e37b3d8832ac9393d869932ce7e2a29d49117
 2021-04-22 00:31:32 +00:00
Elliott Hughes 04d2dcefa2 Merge "Move some make variables from GNU binutils to LLVM equivalents." am: 7c0abf6f3c am: 6b4a5ab97b am: fd6c513703 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1683506

Change-Id: I697975ae430c2a0760434d401b0190b87f0220bf
 2021-04-22 00:31:07 +00:00
Treehugger Robot 13fc2fa05c Merge changes I9a08bbc0,I049d1bb9 am: 752d63cd83 am: e8bfb5a3a0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1682583

Change-Id: I0a22747f144972c7378245980ce61640c1f01f9f
 2021-04-22 00:07:28 +00:00
Elliott Hughes fd6c513703 Merge "Move some make variables from GNU binutils to LLVM equivalents." am: 7c0abf6f3c am: 6b4a5ab97b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1683506

Change-Id: I7a5ef28206e54bad57664fb710abb95eee57e8a7
 2021-04-22 00:07:19 +00:00
Treehugger Robot e8bfb5a3a0 Merge changes I9a08bbc0,I049d1bb9 am: 752d63cd83 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1682583

Change-Id: I8192b0ee13a4eaa550ea34fb4e7b706e1ffc9d73
 2021-04-21 23:49:26 +00:00
Elliott Hughes 6b4a5ab97b Merge "Move some make variables from GNU binutils to LLVM equivalents." am: 7c0abf6f3c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1683506

Change-Id: I568de05d0b8225a5c554f46cd4723602a5ec4069
 2021-04-21 23:48:44 +00:00